X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=src%2Fclient%2Ffuse%2FMakefile.am;h=cf3d98aeb0c503a7cf415e14328921afd20f5a91;hb=a369aa0578f4a98f7b18a18ecc11d266b0f7fe71;hp=9d673c3189d60c892586e67263276bf32a88685f;hpb=755a85d239c13355ff1a0cc4f884acdeb5e4e188;p=captive.git

diff --git a/src/client/fuse/Makefile.am b/src/client/fuse/Makefile.am
index 9d673c3..cf3d98a 100644
--- a/src/client/fuse/Makefile.am
+++ b/src/client/fuse/Makefile.am
@@ -60,22 +60,46 @@ mount_captive_SOURCES= \
 		op_utime.h \
 		gnomevfsresult.c \
 		gnomevfsresult.h \
-		gnomevfsfileinfo.c \
-		gnomevfsfileinfo.h \
+		capfuse_captive_file_info_object.c \
+		capfuse_captive_file_info_object.h \
 		main.c \
-		main.h
-mount_captive_CFLAGS=                   $(GNOME_VFS_CFLAGS) $(FUSE_CFLAGS)
-mount_captive_LDADD =$(captive_library) $(GNOME_VFS_LIBS)   $(FUSE_LIBS)   $(INTLLIBS)
+		main.h \
+		utf8.c \
+		utf8.h
+mount_captive_CFLAGS=                   $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS) $(FUSE_CFLAGS)
+mount_captive_LDADD =$(captive_library) $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(FUSE_LIBS)   $(INTLLIBS)
 mount_captive_LDFLAGS=$(READLINE_LDFLAGS)
 
 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
 
+if ENABLE_STANDALONE
+libexec_PROGRAMS_cond=captive-fusermount
+
+install-exec-hook-captive-fusermount:
+	chown root.fuse $(DESTDIR)/$(libexecdir)/captive-fusermount
+	chmod 4754      $(DESTDIR)/$(libexecdir)/captive-fusermount
+	if grep -q '^fuse:' /etc/group;then true;else \
+		echo "ERROR: Add 'fuse' to your '/etc/group'; see groupadd(8)"; \
+		exit 1; \
+	fi;
+
+else
+install-exec-hook-captive-fusermount:
+	@true
+
+endif
+
+# Do not: libexecPROGRAMS_INSTALL=${INSTALL} -o root -g fuse -m 4754
+# as it works only on Fedora Core based systems, at least SuSE 10.0 correctly fails.
+# 	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176708
+
 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)$(enable_sbin_mountdir)
 	IFS=:; \
@@ -87,10 +111,7 @@ install-exec-hook:
 		fi; \
 		done
 	if test `id -u` -eq 0 -a -z "$(DESTDIR)";then \
-		if grep -q '^fuse:' /etc/group;then true;else \
-			echo "ERROR: Add 'fuse' to your '/etc/group'; see groupadd(8)"; \
-			exit 1; \
-		fi; \
+		$(MAKE) $(AM_MAKEFLAGS) install-exec-hook-captive-fusermount; \
 	fi
 
 else
@@ -128,10 +149,3 @@ captive_fusermount_SOURCES= \
 captive_fusermount_CFLAGS=
 captive_fusermount_LDADD =$(captive_library)
 libexec_PROGRAMS=$(libexec_PROGRAMS_cond)
-libexecPROGRAMS_INSTALL=${INSTALL} -o root -g fuse -m 4754
-
-if ENABLE_FUSE
-if ENABLE_STANDALONE
-libexec_PROGRAMS_cond=captive-fusermount
-endif
-endif