ITS#7743 bits

[openldap] / build / man.mk

diff --git a/build/man.mk b/build/man.mk
index 4052ab3333413331289ccc628b89b28e5b017125..d43b183736a334f14c9f722cf531febe7b69b01c 100644 (file)
--- a/build/man.mk
+++ b/build/man.mk
@@ -1,7 +1,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2013 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@ all-common:
        PAGES=`cd $(srcdir); echo *.$(MANSECT)`; \
        for page in $$PAGES; do \
                $(SED) -e "s%LDVERSION%$(VERSION)%" \
-                       -e 's%ETCDIR%$(sysconfdir)%' \
+                       -e 's%ETCDIR%$(sysconfdir)%g' \
                        -e 's%LOCALSTATEDIR%$(localstatedir)%' \
                        -e 's%SYSCONFDIR%$(sysconfdir)%' \
                        -e 's%DATADIR%$(datadir)%' \
@@ -31,20 +31,22 @@ all-common:
                        -e 's%BINDIR%$(bindir)%' \
                        -e 's%LIBDIR%$(libdir)%' \
                        -e 's%LIBEXECDIR%$(libexecdir)%' \
+                       -e 's%MODULEDIR%$(moduledir)%' \
                        -e 's%RELEASEDATE%$(RELEASEDATE)%' \
-                       $(srcdir)/$$page > $$page.$(TMP_SUFFIX); \
+                               $(srcdir)/$$page \
+                       | (cd $(srcdir); $(SOELIM) -) > $$page.$(TMP_SUFFIX); \
        done
 
 install-common:
        -$(MKDIR) $(DESTDIR)$(MANDIR)
        PAGES=`cd $(srcdir); echo *.$(MANSECT)`; \
        for page in $$PAGES; do \
-               echo "installing $(MANDIR)/$$page"; \
+               echo "installing $$page in $(DESTDIR)$(MANDIR)"; \
                $(RM) $(DESTDIR)$(MANDIR)/$$page; \
                $(INSTALL) $(INSTALLFLAGS) -m 644 $$page.$(TMP_SUFFIX) $(DESTDIR)$(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"; \
+                               echo "installing $$link in $(DESTDIR)$(MANDIR) as link to $$page"; \
                                $(RM) $(DESTDIR)$(MANDIR)/$$link ; \
                                $(LN_S) $(DESTDIR)$(MANDIR)/$$page $(DESTDIR)$(MANDIR)/$$link; \
                        done; \