]> git.ipfire.org Git - thirdparty/libcgroup.git/commitdiff
Make the installation of init scripts optional
authorJan Safranek <jsafrane@redhat.com>
Mon, 31 May 2010 15:15:15 +0000 (17:15 +0200)
committerDhaval Giani <dhaval.giani@gmail.com>
Tue, 1 Jun 2010 15:44:40 +0000 (17:44 +0200)
Some distros do not like 'make install' to install also initscripts. So
let's make it configurable with --enable-initscripts-install.

The default behavior is not to install them - they probably work only on
Fedora.

Signed-off-by: Jan Safranek <jsafrane@redhat.com>
Signed-off-by: Dhaval Giani <dhaval.giani@gmail.com>
configure.in
dist/libcgroup.spec.in
scripts/Makefile.am

index 4fae065a0e2624fa29a3acd5a50d77f2c8211e57..eda613281b05573cf7082b8f09042c13b16174c9 100644 (file)
@@ -79,6 +79,19 @@ AC_ARG_ENABLE([daemon],
        [with_daemon=true])
 AM_CONDITIONAL([WITH_DAEMON], [test x$with_daemon = xtrue])
 
+AC_ARG_ENABLE([initscript-install],
+       [AC_HELP_STRING([--enable-initscript-install],
+               [install init scripts [default=no]])],
+       [
+               if test "x$enableval" = xno; then
+                       with_initscript_install=false
+               else
+                       with_initscript_install=true
+               fi
+       ],
+       [with_initscript_install=false])
+AM_CONDITIONAL([WITH_INITSCRIPT_INSTALL], [test x$with_initscript_install = xtrue])
+
 socket_path="/var/run/cgred.socket"
 AC_ARG_ENABLE([cgred-socket],
        [AC_HELP_STRING([--enable-cgred-socket=PATH],
index 99cc885b657641d34e0dd2ccf2e6c28e7c73b1e7..04b74909ba6a1ea76fc6e9036cff22974dd23533 100644 (file)
@@ -44,7 +44,7 @@ provide scripts to manage that configuration.
 %setup -q
 
 %build
-%configure --bindir=/bin --sbindir=/sbin --libdir=%{_libdir}
+%configure --bindir=/bin --sbindir=/sbin --libdir=%{_libdir} --enable-initscript-install
 
 make %{?_smp_mflags}
 
index c6fbcdaffbefc4f38e2ad9c1fbb7bcf331c3dfe5..c78272ccca406e34e818392b9bac59806e5997e3 100644 (file)
@@ -1,5 +1,6 @@
 EXTRA_DIST = init.d/cgconfig.in init.d/cgred.in
 
+if WITH_INITSCRIPT_INSTALL
 INITSCRIPTDIR=$(DESTDIR)$(sysconfdir)/rc.d/init.d
 install-exec-hook:
        mkdir -p $(INITSCRIPTDIR)
@@ -7,3 +8,4 @@ install-exec-hook:
 
 uninstall-hook:
        rm -f $(INITSCRIPTDIR)/cgconfig $(INITSCRIPTDIR)/cgred
+endif