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...@apache.org on 2001/09/14 00:19:13 UTC
cvs commit: httpd-2.0/support Makefile.in
rbb 01/09/13 15:19:13
Modified: . Makefile.in
. Makefile.in
support Makefile.in
Log:
Allow make install to work when built with VPATH.
Revision Changes Path
1.83 +9 -9 httpd-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.in,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- Makefile.in 2001/09/13 06:49:08 1.82
+++ Makefile.in 2001/09/13 22:19:13 1.83
@@ -30,7 +30,7 @@
install-conf:
@echo Installing configuration files
@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
- @cd docs/conf; \
+ @cd $(top_srcdir)/docs/conf; \
for i in mime.types magic; do \
$(INSTALL_DATA) $$i $(sysconfdir); \
done; \
@@ -59,39 +59,39 @@
cp srclib/apr/shlibtool $(installbuilddir); \
fi
-htdocs-srcdir = docs/docroot
+htdocs-srcdir = $(top_srcdir)/docs/docroot
docs::
mkdir -p ./docs/api
srclib/apr/build/scandoc.pl -i./build/default.pl -p./docs/api/ ./include/*.h
dox::
- doxygen docs/doxygen.conf
+ doxygen $(top_srcdir)/docs/doxygen.conf
install-htdocs:
@echo Installing HTML documents
@test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
@test -d $(prefix)/manual || $(MKINSTALLDIRS) $(prefix)/manual
- @test -d docs/manual && (cd docs/manual && cp -rp * $(prefix)/manual)
+ @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(prefix)/manual)
@(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
install-error:
@echo Installing error documents
@test -d $(errordir) || $(MKINSTALLDIRS) $(errordir)
- @(cd docs/error && cp -rp * $(errordir))
+ @(cd $(top_srcdir)/docs/error && cp -rp * $(errordir))
@(cd $(errordir) && find . -name "CVS" -print | xargs rm -rf {} \;)
install-icons:
@echo Installing icons
@test -d $(iconsdir) || $(MKINSTALLDIRS) $(iconsdir)
- @(cd docs/icons && cp -rp * $(iconsdir))
+ @(cd $(top_srcdir)/docs/icons && cp -rp * $(iconsdir))
@(cd $(iconsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
install-cgi:
@echo Installing CGIs
@test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
- @(cd docs/cgi-examples && cp -rp * $(cgidir))
+ @(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir))
@(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
install-other:
@@ -131,8 +131,8 @@
@test -d $(mandir) || $(MKINSTALLDIRS) $(mandir)
@test -d $(mandir)/man1 || $(MKINSTALLDIRS) $(mandir)/man1
@test -d $(mandir)/man8 || $(MKINSTALLDIRS) $(mandir)/man8
- @cp -p docs/man/*.1 $(mandir)/man1
- @cp -p docs/man/*.8 $(mandir)/man8
+ @cp -p $(top_srcdir)/docs/man/*.1 $(mandir)/man1
+ @cp -p $(top_srcdir)/docs/man/*.8 $(mandir)/man8
install-suexec:
@if test -f $(builddir)/support/suexec; then \
1.54 +2 -2 apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/Makefile.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Makefile.in 2001/08/12 05:13:20 1.53
+++ Makefile.in 2001/09/13 22:19:13 1.54
@@ -51,11 +51,11 @@
install: $(TARGET_LIB)
if [ ! -d $(includedir) ]; then \
- ./build/mkdir.sh $(includedir); \
+ $(srcdir)/build/mkdir.sh $(includedir); \
fi; \
cp include/*.h $(includedir); \
if [ ! -d $(libdir) ]; then \
- ./build/mkdir.sh $(libdir); \
+ $(srcdir)/build/mkdir.sh $(libdir); \
fi; \
$(LIBTOOL) --mode=install cp $(TARGET_LIB) $(libdir)
$(LIBTOOL) --mode=install cp APRVARS $(libdir)
1.23 +1 -1 httpd-2.0/support/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/support/Makefile.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.in 2001/09/13 06:49:09 1.22
+++ Makefile.in 2001/09/13 22:19:13 1.23
@@ -13,7 +13,7 @@
install:
@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
- @cp -p $(top_srcdir)/server/httpd.exp $(libexecdir)
+ @cp -p $(top_builddir)/server/httpd.exp $(libexecdir)
@cp -p apachectl $(sbindir)
chmod 755 $(sbindir)/apachectl
@if test -f $(builddir)/apxs; then \