diff options
| author | Lennart Poettering <lennart@poettering.net> | 2003-11-17 18:26:07 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2003-11-17 18:26:07 +0000 |
| commit | 58b24fc8eeee103a81cb715b6757bc5633f60176 (patch) | |
| tree | a2f4fab3fe880058db20f99e97ed1a9a9fb98b4a | |
| parent | 219b9b062b40f0f5a4edd982164d170633dc7433 (diff) | |
modify confifure
git-svn-id: file:///home/lennart/svn/public/waproamd/trunk@47 022f378f-78c4-0310-b860-d162c87e6274
| -rw-r--r-- | conf/Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/conf/Makefile.am b/conf/Makefile.am index e3ee3b2..428a7c3 100644 --- a/conf/Makefile.am +++ b/conf/Makefile.am @@ -16,6 +16,8 @@ # along with waproamd; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +sysvinitdir = @SYSV_INITDIR@ + EXTRA_DIST = waproamd.init.in waproamd.conf default.in noinst_DATA = waproamd.init waproamd.conf default CLEANFILES = waproamd.init default @@ -29,12 +31,12 @@ default: default.in Makefile chmod 755 $@ install-data-local: waproamd.init - $(INSTALL) -b -D -m755 waproamd.init ${DESTDIR}/${sysconfdir}/init.d/waproamd + $(INSTALL) -b -D -m755 waproamd.init ${DESTDIR}/${sysvinitdir}/waproamd $(INSTALL) -b -D -m644 $(srcdir)/waproamd.conf ${DESTDIR}/${sysconfdir}/waproamd/waproamd.conf mkdir -p ${DESTDIR}/${sysconfdir}/waproamd/keys $(INSTALL) -D -m755 default ${DESTDIR}/${sysconfdir}/waproamd/scripts/default uninstall-local: rmdir ${DESTDIR}/${sysconfdir}/waproamd/keys - rm -f ${DESTDIR}/${sysconfdir}/init.d/waproamd ${DESTDIR}/${sysconfdir}/waproamd/waproamd.conf + rm -f ${DESTDIR}/${sysvinitdir}/waproamd ${DESTDIR}/${sysconfdir}/waproamd/waproamd.conf rm -f ${DESTDIR}/${sysconfdir}/waproamd/scripts/default diff --git a/configure.ac b/configure.ac index d01fa1e..759df33 100644 --- a/configure.ac +++ b/configure.ac @@ -38,10 +38,14 @@ if test "x$GCC" = "xyes" ; then fi if type -p stow > /dev/null && test -d /usr/local/stow ; then - AC_MSG_NOTICE([*** Found /usr/local/stow: installing to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***]) + AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***]) AC_PREFIX_DEFAULT([/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}]) fi +# Set SysV init script directory +SYSV_INITDIR='$(sysconfdir)/init.d' +AC_SUBST(SYSV_INITDIR) + # Checks for libraries. AC_HEADER_STDC AC_HEADER_SYS_WAIT |