Fixed make clean/install for everything but man pages.

diff --git a/Makefile.in b/Makefile.in
index 7ce76e371df3228aedcf820731c46ef8999e9f04..8f4109902b4f686f0ab1ec99141e393052760c09 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,6 +3,8 @@
 # COPYING RESTRICTIONS APPLY, See COPYRIGHT file
 
 SUBDIRS= include libraries clients servers # contrib
+CLEANDIRS= tests
+INSTALLDIRS= doc
 
 makefiles:     FORCE
        ./config.status

diff --git a/build/dir.mk b/build/dir.mk
index f86d3552b1dea1457b65398c52578f83878102a7..3a0dde4d9faf383f1ac2298cea7453a68ef67251 100644 (file)
--- a/build/dir.mk
+++ b/build/dir.mk
@@ -6,7 +6,7 @@
 
 all-common: all-local FORCE
        @echo "Making all in `$(PWD)`"
-       @for i in $(SUBDIRS); do                                        \
+       @for i in $(SUBDIRS) $(ALLDIRS); do             \
                echo "  Entering subdirectory $$i";             \
                ( cd $$i; $(MAKE) $(MFLAGS) all );              \
                echo " ";                                                               \
@@ -14,7 +14,7 @@ all-common: all-local FORCE
 
 install-common: install-local FORCE
        @echo "Making install in `$(PWD)`"
-       @for i in $(SUBDIRS); do                                        \
+       @for i in $(SUBDIRS) $(INSTALLDIRS); do         \
                echo "  Entering subdirectory $$i";             \
                ( cd $$i; $(MAKE) $(MFLAGS) install );  \
                echo " ";                                                               \
@@ -22,7 +22,7 @@ install-common: install-local FORCE
 
 clean-common: clean-local FORCE
        @echo "Making clean in `$(PWD)`"
-       @for i in $(SUBDIRS); do                                        \
+       @for i in $(SUBDIRS) $(CLEANDIRS); do           \
                echo "  Entering subdirectory $$i";             \
                ( cd $$i; $(MAKE) $(MFLAGS) clean );    \
                echo " ";                                                               \
@@ -30,7 +30,7 @@ clean-common: clean-local FORCE
 
 veryclean-common: veryclean-local FORCE
        @echo "Making veryclean in `$(PWD)`"
-       @for i in $(SUBDIRS); do                                        \
+       @for i in $(SUBDIRS) $(CLEANDIRS); do           \
                echo "  Entering subdirectory $$i";             \
                ( cd $$i; $(MAKE) $(MFLAGS) veryclean );        \
                echo " ";                                                               \
@@ -38,7 +38,7 @@ veryclean-common: veryclean-local FORCE
 
 depend-common: depend-local FORCE
        @echo "Making depend in `$(PWD)`"
-       @for i in $(SUBDIRS); do                                        \
+       @for i in $(SUBDIRS) $(DEPENDDIRS); do          \
                echo "  Entering subdirectory $$i";             \
                ( cd $$i; $(MAKE) $(MFLAGS) depend );   \
                echo " ";                                                               \

diff --git a/build/lib.mk b/build/lib.mk
index 9b1e52a5c8a01568afc236e63ff68370e5fd1e2b..8ae91785ad33a89e635e42b77b9a446fe283d70d 100644 (file)
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -19,7 +19,7 @@ version.c: $(OBJS)
        -e "s|%VERSION%|$${v}|" \
        < Version.c > $@)
 
-install-common: install-local
+install-common: all-common install-local
 
 lint: lint-local FORCE
        $(LINT) $(DEFS) $(DEFINES) $(SRCS)

diff --git a/configure.in b/configure.in
index 4b200f5b3353e8c1652231ebb75c56e3f0b40f96..194a263b38acb1d7225f8e7867c7bbfcb4f8fb64 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -344,10 +344,12 @@ dnl AC_OUTPUT( \
 dnl contrib/Makefile:build/top.mk:contrib/Makefile.in:build/dir.mk \
 dnl contrib/saucer/Makefile:build/top.mk:contrib/saucer/Makefile.in:build/rules.mk \
 dnl contrib/whois++/Makefile:build/top.mk:contrib/whois++/Makefile.in:build/rules.mk \
-dnl Makefile:build/top.mk:Makefile.in:build/dir.mk, \
 dnl [date > stamp-h])
 
 AC_OUTPUT( \
+Makefile:build/top.mk:Makefile.in:build/dir.mk \
+doc/Makefile:build/top.mk:doc/Makefile.in:build/dir.mk \
+doc/man/Makefile:build/top.mk:doc/man/Makefile.in:build/dir.mk \
 clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.mk \
 clients/finger/Makefile:build/top.mk:clients/finger/Makefile.in:build/rules.mk \
 clients/fax500/Makefile:build/top.mk:clients/fax500/Makefile.in:build/rules.mk \
@@ -375,5 +377,4 @@ servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/
 servers/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in \
 servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk \
 tests/Makefile:build/top.mk:tests/Makefile.in \
-Makefile:build/top.mk:Makefile.in:build/dir.mk \
 ,[date > stamp-h])

diff --git a/include/Makefile.in b/include/Makefile.in
index b969697e6036a4f4bdd0975597af1b3c70100644..e9c029af63360b016efc7bcc9bec4f91d32162d1 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -43,7 +43,7 @@ ldapconfig.h: ldapconfig.h.edit Makefile
        $(CHMOD) 444 $@
 
 all-common:                    all-local
-install-common:                install-local
+install-common:                all-common install-local
 clean-common:          clean-local
 veryclean-common:      veryclean-local
 depend-common:         depend-local

diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index a2e2d11762ff1d82cd87978e056deb7ac6d2fe4f..fce02b633d2a8de0278d6a45c10e6eaf88fb39fb 100644 (file)
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -34,6 +34,8 @@ install-local: $(LIBRARY) $(CFFILES) FORCE
        -$(MKDIR) -p $(sysconfdir)
        @for i in $(CFFILES); do \
                echo "installing $$i in $(sysconfdir)"; \
-               $(MV) $(sysconfdir)/$$i $(sysconfdir)/$$i- ; \
+               if test -f $(sysconfdir)$$i; then \
+                       $(MV) $(sysconfdir)/$$i $(sysconfdir)/$$i- ; \
+               fi ; \
                $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir) ; \
        done