X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2FMakefile.am;h=23e7ae952e78577aed8d831e66cfb9b164fcd971;hp=3ed0ace96b6d28cd008f8cf5425f2fd972b5f3b7;hb=4b87dabfab2197323bf39865ec9ad8fc1788230e;hpb=82b53188aaffad0e237461f8f1274794166feb3a

diff --git a/utils/mount/Makefile.am b/utils/mount/Makefile.am
index 3ed0ace..23e7ae9 100644
--- a/utils/mount/Makefile.am
+++ b/utils/mount/Makefile.am
@@ -1,54 +1,31 @@
 ## Process this file with automake to produce Makefile.in
 
-man8_MANS	= mount.nfs.man umount.nfs.man
-
-RPCGEN	= $(top_builddir)/tools/rpcgen/rpcgen
+# These binaries go in /sbin (not /usr/sbin), and that cannot be
+# overriden at config time.
+sbindir = /sbin
 
-GENFILES_CLNT	= nfsmount_clnt.c
-GENFILES_XDR	= nfsmount_xdr.c
-GENFILES_H	= nfsmount.h
-
-GENFILES	= $(GENFILES_CLNT) $(GENFILES_XDR) $(GENFILES_H)
+man8_MANS	= mount.nfs.man umount.nfs.man
+man5_MANS	= nfs.man
 
 sbin_PROGRAMS	= mount.nfs
-EXTRA_DIST = nfsmount.x $(man8_MANS)
-mount_nfs_SOURCES = mount.c nfsmount.c nfs4mount.c nfsumount.c \
-		  nfsmount_xdr.c mount_constants.h nfs4_mount.h nfsmount.h \
-		  nfs_mount4.h
-
-BUILT_SOURCES = $(GENFILES)
-mount_nfs_LDADD = ../../support/nfs/libnfs.a
-
-
-$(RPCGEN):
-	make -C ../../tools/rpcgen all
-
-$(GENFILES_CLNT): %_clnt.c: %.x $(RPCGEN)
-	test -f $@ && rm -rf $@ || true
-	$(RPCGEN) -l -o $@ $<
-
-$(GENFILES_SVC): %_svc.c: %.x $(RPCGEN)
-	test -f $@ && rm -rf $@ || true
-	$(RPCGEN) -m -o $@ $<
-
-$(GENFILES_XDR): %_xdr.c: %.x $(RPCGEN)
-	test -f $@ && rm -rf $@ || true
-	$(RPCGEN) -c -o $@ $<
-
-$(GENFILES_H): %.h: %.x $(RPCGEN)
-	test -f $@ && rm -rf $@ || true
-	$(RPCGEN) -h -o $@ $<
+EXTRA_DIST = nfsmount.x $(man8_MANS) $(man5_MANS)
+mount_nfs_SOURCES = mount.c error.c network.c fstab.c \
+		    nfsmount.c nfs4mount.c stropts.c\
+		    nfsumount.c \
+		    mount_constants.h error.h network.h fstab.h \
+		    nfs4_mount.h nfs_mount4.h stropts.h
 
+mount_nfs_LDADD = ../../support/nfs/libnfs.a \
+		  ../../support/export/libexport.a
 
 MAINTAINERCLEANFILES = Makefile.in
 
-CLEANFILES = $(GENFILES)
-
 install-exec-hook:
 	(cd $(DESTDIR)$(sbindir) && \
-	  ln -sf $(sbin_PROGRAMS) mount.nfs4 && \
-	  ln -sf $(sbin_PROGRAMS) umount.nfs && \
-	  ln -sf $(sbin_PROGRAMS) umount.nfs4)
+	  ln -sf mount.nfs mount.nfs4 && \
+	  ln -sf mount.nfs umount.nfs && \
+	  ln -sf mount.nfs umount.nfs4 && \
+	  chmod 4511 mount.nfs )
 uninstall-hook:
 	(cd $(DESTDIR)$(sbindir) && \
 	    rm -f mount.nfs4 umount.nfs umount.nfs4)
@@ -60,6 +37,11 @@ install-man-links:
 	    inst=`echo $$m | sed -e 's/man$$/8/'`; \
 	    rm -f $$inst ; \
 	  done)
+	(cd $(DESTDIR)$(man5dir) && \
+	  for m in $(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS); do \
+	    inst=`echo $$m | sed -e 's/man$$/5/'`; \
+	    rm -f $$inst ; \
+	  done)
 
 uninstall-man-links:
 	(cd $(DESTDIR)$(man8dir) && \
@@ -67,4 +49,9 @@ uninstall-man-links:
 	    inst=`echo $$m | sed -e 's/man$$/8/'`; \
 	    rm -f $$inst ; \
 	  done)
+	(cd $(DESTDIR)$(man5dir) && \
+	  for m in $(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS); do \
+	    inst=`echo $$m | sed -e 's/man$$/5/'`; \
+	    rm -f $$inst ; \
+	  done)