From d779916ae144e5874cddd8a899059b803df086c2 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 2 Dec 2003 20:03:03 +0000
Subject: stow fix megered --with-initdir patch

git-svn-id: file:///home/lennart/svn/public/ifplugd/trunk@76 2bf48fe7-cfc1-0310-909f-d9042e1e0fef
---
 conf/Makefile.am |  6 ++++--
 configure.ac     | 29 +++++++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/conf/Makefile.am b/conf/Makefile.am
index 475b998..201c301 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -16,6 +16,8 @@
 # along with ifplugd; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
+sysinitdir = @SYSINITDIR@
+
 noinst_DATA = ifplugd.init ifplugd.action ifplugd.conf
 
 EXTRA_DIST = ifplugd.init.in ifplugd.action ifplugd.conf
@@ -27,9 +29,9 @@ ifplugd.init: ifplugd.init.in Makefile
 	chmod 755 $@
 
 install-data-local: ifplugd.init
-	$(INSTALL) -b -D -m755 ifplugd.init ${DESTDIR}${sysconfdir}/init.d/ifplugd
+	$(INSTALL) -b -D -m755 ifplugd.init ${DESTDIR}${sysinitdir}/ifplugd
 	$(INSTALL) -b -D -m755 $(srcdir)/ifplugd.action ${DESTDIR}${sysconfdir}/ifplugd/ifplugd.action
 	$(INSTALL) -b -D -m644 $(srcdir)/ifplugd.conf ${DESTDIR}${sysconfdir}/ifplugd/ifplugd.conf
 
 uninstall-local:
-	rm -f ${DESTDIR}${sysconfdir}/ifplugd/ifplugd.action ${DESTDIR}${sysconfdir}/ifplugd/ifplugd.conf ${DESTDIR}${sysconfdir}/init.d/ifplugd
+	rm -f ${DESTDIR}${sysconfdir}/ifplugd/ifplugd.action ${DESTDIR}${sysconfdir}/ifplugd/ifplugd.conf ${DESTDIR}${sysinitdir}/ifplugd
diff --git a/configure.ac b/configure.ac
index 19952b4..6d8c810 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 AC_PREREQ(2.57)
-AC_INIT([ifplugd], [0.20], [mzvscyhtq (at) 0pointer (dot) de])
+AC_INIT([ifplugd], [0.21], [mzvscyhtq (at) 0pointer (dot) de])
 AC_CONFIG_SRCDIR([src/ifplugd.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign -Wall])
@@ -38,7 +38,9 @@ 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_PREFIX_DEFAULT([/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}])
+   ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
+else
+   ac_default_prefix=="/usr/local"
 fi
 
 AC_PROG_CPP
@@ -70,6 +72,29 @@ AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([alarm dup2 memset select setenv socket strchr strdup strerror strrchr strspn])
 
+# Init script location
+AC_ARG_WITH(initdir, AC_HELP_STRING([--with-initdir=DIR], [Install init script in DIR (system dependent default)]))
+
+test "x$with_initdir" = xyes -o "x$with_initdir" = xno && with_initdir=
+
+if test "x$with_initdir" = x ; then
+    if test -d /etc/init.d ; then
+        SYSINITDIR=/etc/init.d
+    else
+    	if test -d /etc/rc.d/init.d ; then
+        	SYSINITDIR=/etc/rc.d/init.d
+	else
+        	AC_MSG_ERROR(missing --with-initdir=DIR)
+	fi
+    fi
+else
+   SYSINITDIR=$with_initdir
+fi
+
+AC_MSG_NOTICE([Init sript will be installed in $SYSINITDIR])
+AC_SUBST(SYSINITDIR)
+
+
 # LYNX documentation generation
 AC_ARG_ENABLE(lynx,
         AC_HELP_STRING([--disable-lynx], [Turn off lynx usage for documentation generation]),
-- 
cgit