X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=rules.mk;h=7d0fc31ffb85f8b399b979a7ec8b79f7a9274db1;hp=c7734604f99cdf8b87deb04d25191cc6097e7dc1;hb=5206cbfa8934cb7331a840f3446d35cdbb795e34;hpb=8b7ad01b14df1e7529b9ba8a1ea17df0d6004ef9

diff --git a/rules.mk b/rules.mk
index c773460..7d0fc31 100644
--- a/rules.mk
+++ b/rules.mk
@@ -13,7 +13,8 @@ ifneq ($(SUBDIRS),)
 $(ALLTARGETS)::
 	@set -e; for d in $(SUBDIRS); do \
 		echo "Making $@ in $$d"; \
-		$(MAKE) --no-print-directory TOP=../$(TOP) -C $$d $@; \
+		$(MAKE) $(MFLAGS) --no-print-directory \
+			-C $$d TOP=../$(TOP) $@; \
 	done
 endif
 
@@ -80,22 +81,22 @@ distclean::
 ##################################################################
 ifneq ($(MAN1)$(MAN5)$(MAN8)$(MAN9),)
 MANINIT	= ext=$(MAN$sEXT); dir=$(MAN$sDIR); pgs="$(MAN$s)";
-MANLOOP = $(MANINIT) for man in $$pgs; do eval $$cmd; done
+MANLOOP = $(MANINIT) for man in $$pgs; do mn=`echo $$man | sed 's/[0-9]$$//'`; eval $$cmd; done
 MDCMD	= $(MKDIR) \$$dir
-MICMD	= $(RM) \$$dir/\$$man.\$$ext; \
-	  echo $(INSTALLMAN) \$$man.man \$$dir/\$$man.\$$ext; \
-	  $(INSTALLMAN) \$$man.man \$$dir/\$$man.\$$ext
-LNCMD	= $(RM) \$$dir/$(PREFIX)\$$man.\$$ext; \
-	  echo $(LN_S) \$$man.\$$ext \$$dir/$(PREFIX)\$$man.\$$ext; \
-	  $(LN_S) \$$man.\$$ext \$$dir/$(PREFIX)\$$man.\$$ext
+MICMD	= $(RM) \$$dir/\$$mn.\$$ext; \
+	  echo $(INSTALLMAN) \$$man.man \$$dir/\$$mn.\$$ext; \
+	  $(INSTALLMAN) \$$man.man \$$dir/\$$mn.\$$ext
+LNCMD	= $(RM) \$$dir/$(PREFIX)\$$mn.\$$ext; \
+	  echo $(LN_S) \$$mn.\$$ext \$$dir/$(PREFIX)\$$mn.\$$ext; \
+	  $(LN_S) \$$mn.\$$ext \$$dir/$(PREFIX)\$$mn.\$$ext
 PSCMD	= echo \"$(MAN2PS) \$$man.man > $(TOP)postscript/\$$man.ps\"; \
 	  $(MAN2PS) \$$man.man > $(TOP)postscript/\$$man.ps
 
 installman::
-	@$(foreach s, 1 5 8 9, cmd="$(MDCMD)" $(MANLOOP);)
-	@$(foreach s, 1 5 8 9, cmd="$(MICMD)" $(MANLOOP);)
+	@$(foreach s, 1 5 7 8 9, cmd="$(MDCMD)" $(MANLOOP);)
+	@$(foreach s, 1 5 7 8 9, cmd="$(MICMD)" $(MANLOOP);)
 ifneq ($(PREFIX),)
-	@$(foreach s, 1 5 8 9, cmd="$(LNCMD)" $(MANLOOP);)
+	@$(foreach s, 1 5 7 8 9, cmd="$(LNCMD)" $(MANLOOP);)
 endif
 
 postscript::
@@ -112,13 +113,16 @@ ifneq ($(SRCS),)
 indent:
 	$(INDENT) $(SRCS)
 endif
-	
+
 ##################################################################
 # Handling of dependencies
 ##################################################################
 ifneq ($(OBJS),)
-depend dep::
+predep::
+depend dep:: predep
 	$(CC) $(CFLAGS) -M $(OBJS:.o=.c) > .depend
+else
+depend dep::
 endif
 
 ifeq (.depend,$(wildcard .depend))