Integrate static packaing into the CVS HEAD; make it even default.

[captive.git] / src / client / fuse / Makefile.am

diff --git a/src/client/fuse/Makefile.am b/src/client/fuse/Makefile.am
index d0d9bde..d551212 100644 (file)
--- a/src/client/fuse/Makefile.am
+++ b/src/client/fuse/Makefile.am
@@ -68,12 +68,13 @@ mount_captive_CFLAGS=                   $(GNOME_VFS_CFLAGS) $(FUSE_CFLAGS)
 mount_captive_LDADD =$(captive_library) $(GNOME_VFS_LIBS)   $(FUSE_LIBS)   $(INTLLIBS)
 mount_captive_LDFLAGS=$(READLINE_LDFLAGS)
 
-mount_captive_CFLAGS+=-DSBINDIR="$(sbindir)"
+mount_captive_CFLAGS+=-DLIBEXECDIR="$(libexecdir)"
 mount_captive_CFLAGS+=-DVARLIBCAPTIVEDIR="$(localstatedir)/lib/$(PACKAGE)"
 
 if ENABLE_FUSE
 if ENABLE_SBIN_MOUNT
 mount_captive_cond=mount.captive
+initd_SCRIPTS_cond=captive
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(enable_sbin_mountdir)
@@ -96,7 +97,7 @@ install-exec-hook:
        @true
 
 endif
-bin_PROGRAMS+=$(mount_captive_cond)
+enable_sbin_mount_PROGRAMS=$(mount_captive_cond)
 
 EXTRA_DIST+=mount.captive.pod.pl.in
 CLEANFILES+=mount.captive.pod mount.captive.1
@@ -109,3 +110,10 @@ endif
 endif
 endif
 man_MANS=$(mount_captive_man_cond)
+
+initd_SCRIPTS=$(initd_SCRIPTS_cond)
+EXTRA_DIST+=captive.init
+CLEANFILES+=captive
+captive: captive.init
+       $(LN_S) $< $@
+