From: Ben Collins <bcollins@openldap.org>
Date: Wed, 14 Jul 1999 19:44:44 +0000 (+0000)
Subject: Use the same man build setup as the devel branch so that TMPROOT builds
X-Git-Tag: OPENLDAP_REL_ENG_1_2_4~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0940faafcdebda8dc9f23a135e705476773df42;p=thirdparty%2Fopenldap.git

Use the same man build setup as the devel branch so that TMPROOT builds
get the correct file and directory names sed'd into the man pages.
---

diff --git a/build/man.mk b/build/man.mk
index b6aefa8dbf..9bcc0c22b6 100644
--- a/build/man.mk
+++ b/build/man.mk
@@ -7,14 +7,12 @@
 ##
 
 MANDIR=$(mandir)/man$(MANSECT)
+TMP_SUFFIX=tmp
 
-install-common: FORCE
-	-$(MKDIR) -p $(MANDIR)
-	@TMPMAN=/tmp/ldapman.$$$$$(MANCOMPRESSSUFFIX); \
-	VERSION=`$(CAT) $(VERSIONFILE)`; \
-	cd $(srcdir); \
-	for page in *.$(MANSECT); do \
-		$(SED) -e "s%LDVERSION%$$VERSION%" \
+all-common:
+	PAGES=`cd $(srcdir); echo *.$(MANSECT)`; \
+	for page in $$PAGES; do \
+		$(SED) -e "s%LDVERSION%$(VERSION)%" \
 			-e 's%ETCDIR%$(sysconfdir)%' \
 			-e 's%LOCALSTATEDIR%$(localstatedir)%' \
 			-e 's%SYSCONFDIR%$(sysconfdir)%' \
@@ -23,19 +21,26 @@ install-common: FORCE
 			-e 's%BINDIR%$(bindir)%' \
 			-e 's%LIBDIR%$(libdir)%' \
 			-e 's%LIBEXECDIR%$(libexecdir)%' \
-			$$page | $(MANCOMPRESS) > $$TMPMAN; \
+			$(srcdir)/$$page > $$page.$(TMP_SUFFIX); \
+	done
+	touch all-common
+
+install-common:
+	-$(MKDIR) $(MANDIR)
+	PAGES=`cd $(srcdir); echo *.$(MANSECT)`; \
+	for page in $$PAGES; do \
 		echo "installing $(MANDIR)/$$page"; \
-		$(RM) $(MANDIR)/$$page $(MANDIR)/$$page$(MANCOMPRESSSUFFIX); \
-		$(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(MANDIR)/$$page$(MANCOMPRESSSUFFIX); \
-		if [ -f "$$page.links" ]; then \
-			for link in `$(CAT) $$page.links`; do \
+		$(RM) $(MANDIR)/$$page; \
+		$(INSTALL) $(INSTALLFLAGS) -m 644 $$page.$(TMP_SUFFIX) $(MANDIR)/$$page; \
+		if test -f "$(srcdir)/$$page.links" ; then \
+			for link in `$(CAT) $(srcdir)/$$page.links`; do \
 				echo "installing $(MANDIR)/$$link as link to $$page"; \
-				$(RM) $(MANDIR)/$$link $(MANDIR)/$$link$(MANCOMPRESSSUFFIX); \
-				$(LN_S) $$page$(MANCOMPRESSSUFFIX) $(MANDIR)/$$link$(MANCOMPRESSSUFFIX); \
+				$(LN_S) -f $$page $(MANDIR)/$$link; \
 			done; \
 		fi; \
-	done; \
-	$(RM) $$TMPMAN
+	done
 
-Makefile: $(top_srcdir)/build/lib.mk
+clean-common:   FORCE
+	$(RM) *.tmp all-common
 
+Makefile: $(top_srcdir)/build/man.mk