From: Greg Ames <gregames@apache.org>
Date: Thu, 25 Jul 2002 15:47:12 +0000 (+0000)
Subject: Install the online manual unconditionally.  This gets make install closer
X-Git-Tag: 2.0.40~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=708afa1ea25656720785fc0e415ea9be1011b9fc;p=thirdparty%2Fapache%2Fhttpd.git

Install the online manual unconditionally.  This gets make install closer
to how it *really* works in 1.3.

Also, get rid of CVS stuff in the manual/ directory

Submitted by: Justin Erenkrantz, Greg Ames


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96187 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/Makefile.in b/Makefile.in
index f36f72ffa04..e77ab2b0941 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -112,13 +112,7 @@ install-htdocs:
 	    echo Installing HTML documents ; \
 	    $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
 	    test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
-	fi
-	-@if [ -d $(DESTDIR)$(manualdir) ]; then \
-           echo "[PRESERVING EXISTING MANUAL SUBDIR: $(DESTDIR)$(manualdir)]"; \
-        else \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) ; \
-	    test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir)) ; \
-	    test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf ; \
+	    cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf ; \
 	fi
 
 install-error:
@@ -187,12 +181,15 @@ install-include:
 	@chmod 644 $(DESTDIR)$(includedir)/*.h
 
 install-man:
-	@echo Installing man pages
+	@echo Installing man pages and online manual
 	@test -d $(DESTDIR)$(mandir)      || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
 	@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
 	@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
+	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
 	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
 	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
+	@(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
+	@(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -print | xargs rm -rf)
 
 install-suexec:
 	@if test -f $(builddir)/support/suexec; then \