Move manpage management out of the perl build system.

(This used to be commit a660ab262e7202baccf16cb8b2bc47cb8efacc34)

4 files changed, 28 insertions, 14 deletions

diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 7d6328fc52..ad202fb34e 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -147,12 +147,13 @@ PUBLIC_DEPENDENCIES = \
 		LIBTALLOC
 PRIVATE_DEPENDENCIES = \
 		SOCKET_WRAPPER
-MANPAGE = man/ldb.3
 PUBLIC_HEADERS = include/ldb.h include/ldb_errors.h
 #
 # End SUBSYSTEM ldb
 ################################################
 
+MANPAGES += $(ldbdir)/man/ldb.3
+
 ################################################
 # Start BINARY ldbtest
 [BINARY::ldbtest]
@@ -167,7 +168,6 @@ PRIVATE_DEPENDENCIES = \
 # Start BINARY oLschema2ldif
 [BINARY::oLschema2ldif]
 INSTALLDIR = BINDIR
-MANPAGE = man/oLschema2ldif.1
 OBJ_FILES= \
 		tools/convert.o \
 		tools/oLschema2ldif.o
@@ -176,11 +176,12 @@ PRIVATE_DEPENDENCIES = \
 # End BINARY oLschema2ldif
 ################################################
 
+MANPAGES += $(ldbdir)/man/oLschema2ldif.1
+
 ################################################
 # Start BINARY  ad2oLschema
 [BINARY::ad2oLschema]
 INSTALLDIR = BINDIR
-MANPAGE = man/ad2oLschema.1
 OBJ_FILES= \
 		tools/convert.o \
 		tools/ad2oLschema.o
@@ -189,6 +190,7 @@ PRIVATE_DEPENDENCIES = \
 # End BINARY ad2oLschema
 ################################################
 
+MANPAGES += $(ldbdir)/man/ad2oLschema.1
 
 mkinclude tools/config.mk
 mkinclude ldb_ildap/config.mk
diff --git a/source4/lib/ldb/tools/config.mk b/source4/lib/ldb/tools/config.mk
index bf6c5f963c..c1c368f336 100644
--- a/source4/lib/ldb/tools/config.mk
+++ b/source4/lib/ldb/tools/config.mk
@@ -17,10 +17,11 @@ OBJ_FILES = \
 		ldbadd.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE LIBCLI_RESOLVE
-MANPAGE = ../man/ldbadd.1
 # End BINARY ldbadd
 ################################################
 
+MANPAGES += $(ldbdir)/../man/ldbadd.1
+
 ################################################
 # Start BINARY ldbdel
 [BINARY::ldbdel]
@@ -29,10 +30,11 @@ OBJ_FILES= \
 		ldbdel.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE
-MANPAGE = ../man/ldbdel.1
 # End BINARY ldbdel
 ################################################
 
+MANPAGES += $(ldbdir)/../man/ldbdel.1
+
 ################################################
 # Start BINARY ldbmodify
 [BINARY::ldbmodify]
@@ -41,10 +43,11 @@ OBJ_FILES= \
 		ldbmodify.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE
-MANPAGE = ../man/ldbmodify.1
 # End BINARY ldbmodify
 ################################################
 
+MANPAGES += $(ldbdir)/../man/ldbmodify.1
+
 ################################################
 # Start BINARY ldbsearch
 [BINARY::ldbsearch]
@@ -53,10 +56,11 @@ OBJ_FILES= \
 		ldbsearch.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE 
-MANPAGE = ../man/ldbsearch.1
 # End BINARY ldbsearch
 ################################################
 
+MANPAGES += $(ldbdir)/../man/ldbsearch.1
+
 ################################################
 # Start BINARY ldbedit
 [BINARY::ldbedit]
@@ -65,10 +69,11 @@ OBJ_FILES= \
 		ldbedit.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE
-MANPAGE = ../man/ldbedit.1
 # End BINARY ldbedit
 ################################################
 
+MANPAGES += $(ldbdir)/../man/ldbedit.1
+
 ################################################
 # Start BINARY ldbrename
 [BINARY::ldbrename]
@@ -77,8 +82,9 @@ OBJ_FILES= \
 		ldbrename.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE
-MANPAGE = ../man/ldbrename.1
 # End BINARY ldbrename
 ################################################
 
+MANPAGES += $(ldbdir)/../man/ldbrename.1
+
 
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 7a9c8fcff1..af5b1bc301 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -52,10 +52,11 @@ INSTALLDIR = BINDIR
 OBJ_FILES = tools/regdiff.o
 PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
-MANPAGE = man/regdiff.1
 # End BINARY regdiff
 ################################################
 
+MANPAGES += lib/registry/man/regdiff.1
+
 ################################################
 # Start BINARY regpatch
 [BINARY::regpatch]
@@ -64,10 +65,11 @@ OBJ_FILES = tools/regpatch.o
 PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS \
 		registry_common
-MANPAGE = man/regpatch.1
 # End BINARY regpatch
 ################################################
 
+MANPAGES += lib/registry/man/regpatch.1
+
 ################################################
 # Start BINARY regshell
 [BINARY::regshell]
@@ -76,10 +78,11 @@ OBJ_FILES = tools/regshell.o
 PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
 		SMBREADLINE registry_common
-MANPAGE = man/regshell.1
 # End BINARY regshell
 ################################################
 
+MANPAGES += lib/registry/man/regshell.1
+
 ################################################
 # Start BINARY regtree
 [BINARY::regtree]
@@ -88,10 +91,11 @@ OBJ_FILES = tools/regtree.o
 PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
 		registry_common
-MANPAGE = man/regtree.1
 # End BINARY regtree
 ################################################
 
+MANPAGES += lib/registry/man/regtree.1
+
 [SUBSYSTEM::torture_registry]
 PRIVATE_DEPENDENCIES = registry
 PRIVATE_PROTO_HEADER = tests/proto.h
diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk
index af1b590c98..abbad2e613 100644
--- a/source4/lib/talloc/config.mk
+++ b/source4/lib/talloc/config.mk
@@ -1,6 +1,8 @@
 [LIBRARY::LIBTALLOC]
 OUTPUT_TYPE = STATIC_LIBRARY
 OBJ_FILES = talloc.o
-MANPAGE = talloc.3
 CFLAGS = -Ilib/talloc
 PUBLIC_HEADERS = talloc.h
+
+
+MANPAGES += $(tallocdir)/talloc.3