[Cluster-devel] cluster gfs/Makefile gfs2/mount/Makefile

[Cluster-devel] cluster gfs/Makefile gfs2/mount/Makefile

[fabbione]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2007-11-14 12:33:45

Modified files:
	gfs            : Makefile 
	gfs2/mount     : Makefile 

Log message:
	Hard encode paths to (u)mount.gfs*
	
	given the very nature of mount(8) api to look only in /sbin for (u)mount
	helpers, we can hard encode the install paths for our tools into the
	Makefile systems. I have never seen anywhere a different behavior in any
	Linux distribution and it will make packagers life simpler.
	
	Thanks also to Marc - A. Dahlhaus for spotting the missing DESTDIR
	entries.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19

--- cluster/gfs/Makefile	2007/08/29 03:09:54	1.12
+++ cluster/gfs/Makefile	2007/11/14 12:33:45	1.13
@@ -24,10 +24,11 @@
 		${MAKE} -C $$i $@; \
 	done; \
 	if [ "$@" = "install" ]; then \
-		cd ${sbindir}; \
+		mkdir -p ${DESTDIR}/sbin; \
+		cd ${DESTDIR}/sbin; \
 			ln -sf mount.gfs2 mount.gfs; \
 			ln -sf umount.gfs2 umount.gfs; \
 	fi; \
 	if [ "$@" = "uninstall" ]; then \
-		cd ${sbindir}; rm -f mount.gfs umount.gfs; \
+		cd ${DESTDIR}/sbin; rm -f mount.gfs umount.gfs; \
 	fi
--- cluster/gfs2/mount/Makefile	2007/08/28 04:35:44	1.18
+++ cluster/gfs2/mount/Makefile	2007/11/14 12:33:45	1.19
@@ -41,11 +41,11 @@
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 install: all
-	install ${TARGET1} ${sbindir}
-	install ${TARGET2} ${sbindir}
+	mkdir -p ${DESTDIR}/sbin
+	install ${TARGET1} ${TARGET2} ${DESTDIR}/sbin
 
 uninstall:
-	${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
+	${UNINSTALL} ${TARGET1} ${TARGET2} ${DESTDIR}/sbin
 
 clean:
 	rm -f *.o ${TARGET1} ${TARGET2}