You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/12/19 23:25:46 UTC
cvs commit: httpd-2.0 CHANGES Makefile.in
rbb 00/12/19 14:25:45
Modified: . CHANGES Makefile.in
Log:
Install all headers in the include/ directory.
Revision Changes Path
1.15 +2 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CHANGES 2000/12/19 17:05:06 1.14
+++ CHANGES 2000/12/19 22:25:42 1.15
@@ -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
1.45 +9 -9 httpd-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.in,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Makefile.in 2000/12/19 17:05:07 1.44
+++ Makefile.in 2000/12/19 22:25:42 1.45
@@ -96,10 +96,10 @@
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 @@
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
Re: cvs commit: httpd-2.0 CHANGES Makefile.in
Posted by rb...@covalent.net.
> > @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)
>
> Why test for $(includedir)/xml, etc? IOW, those four lines are redundant.
Because I wasn't paying attention. :-)
Ryan
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------
Re: cvs commit: httpd-2.0 CHANGES Makefile.in
Posted by Greg Stein <gs...@lyra.org>.
On Tue, Dec 19, 2000 at 10:25:46PM -0000, rbb@locus.apache.org wrote:
>...
> --- Makefile.in 2000/12/19 17:05:07 1.44
> +++ Makefile.in 2000/12/19 22:25:42 1.45
> @@ -96,10 +96,10 @@
> 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)
Why test for $(includedir)/xml, etc? IOW, those four lines are redundant.
:-)
Cheers,
-g
--
Greg Stein, http://www.lyra.org/