From: Ryan Bloom <rbb@apache.org>
Date: Tue, 19 Dec 2000 22:25:42 +0000 (+0000)
Subject: Install all headers in the include/ directory.
X-Git-Tag: APACHE_2_0_BETA_CANDIDATE_1~395
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4116c0ff0cd33119fff8d057ea0091da9950118;p=apache

Install all headers in the include/ directory.


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

diff --git a/CHANGES b/CHANGES
index 00c48b2d04..0cc11edb5a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
 Changes with Apache 2.0b1
+  *) Install all header files in the same directory on Unix. [Ryan Bloom]
+
   *) Get the functions in server/linked into the server, regardless of
      which modules linked into the server.  This uses the same hack 
      for Apache that we use for APR and apr-util to ensure all of the
diff --git a/Makefile.in b/Makefile.in
index dfa123b9b3..fcb6a9e367 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -96,10 +96,10 @@ install-other:
 install-include:
 	@echo Installing header files
 	@test -d $(includedir)     || $(MKINSTALLDIRS) $(includedir)
-	@test -d $(includedir)/xml || $(MKINSTALLDIRS) $(includedir)/xml
-	@test -d $(includedir)/pcre || $(MKINSTALLDIRS) $(includedir)/pcre
-	@test -d $(includedir)/apr || $(MKINSTALLDIRS) $(includedir)/apr
-	@test -d $(includedir)/apr-util || $(MKINSTALLDIRS) $(includedir)/apr-util
+	@test -d $(includedir)/xml || $(MKINSTALLDIRS) $(includedir)
+	@test -d $(includedir)/pcre || $(MKINSTALLDIRS) $(includedir)
+	@test -d $(includedir)/apr || $(MKINSTALLDIRS) $(includedir)
+	@test -d $(includedir)/apr-util || $(MKINSTALLDIRS) $(includedir)
 	@cp -p include/*.h $(srcdir)/include/*.h $(includedir)
 	@cp -p $(srcdir)/os/$(OS_DIR)/os.h $(includedir)
 	@if test -f $(srcdir)/os/$(OS_DIR)/os-inline.c; then \
@@ -107,8 +107,8 @@ install-include:
         fi;
 	@cp -p $(srcdir)/modules/dav/main/mod_dav.h $(includedir)
 	@cp -p $(srcdir)/modules/filters/mod_include.h $(includedir)
-	@cp -p $(srcdir)/srclib/expat-lite/*.h $(includedir)/xml
-	@cp -p $(srcdir)/srclib/pcre/*.h $(includedir)/pcre
-	@cp -p $(srcdir)/srclib/apr/include/*.h $(includedir)/apr
-	@cp -p $(srcdir)/srclib/apr-util/include/*.h $(includedir)/apr-util
-	@chmod 644 $(includedir)/*.h $(includedir)/xml/*.h $(includedir)/apr/*.h
+	@cp -p $(srcdir)/srclib/expat-lite/*.h $(includedir)
+	@cp -p $(srcdir)/srclib/pcre/*.h $(includedir)
+	@cp -p $(srcdir)/srclib/apr/include/*.h $(includedir)
+	@cp -p $(srcdir)/srclib/apr-util/include/*.h $(includedir)
+	@chmod 644 $(includedir)/*.h