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/06 01:46:18 UTC
cvs commit: httpd-2.0 Makefile.in
rbb 00/12/05 16:46:18
Modified: . Makefile.in
Log:
Get Apache installing again.
Revision Changes Path
1.38 +6 -6 httpd-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Makefile.in 2000/12/05 02:45:46 1.37
+++ Makefile.in 2000/12/06 00:46:17 1.38
@@ -26,16 +26,16 @@
install-conf:
@echo Installing configuration files
@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
- @cd $(srcdir)/../conf; \
+ @cd docs/conf; \
for i in mime.types magic; do \
$(INSTALL_DATA) $$i $(sysconfdir); \
done; \
- for i in *-dist; do \
+ for i in *-std*; do \
sed -e 's#@@ServerRoot@@#$(prefix)#g' \
-e 's#@@Port@@#$(PORT)#g' \
< $$i > $(sysconfdir)/$$i; \
chmod 0644 $(sysconfdir)/$$i; \
- file=`echo $$i|sed s/-dist//`; \
+ file=`echo $$i|sed s/-std//`; \
if [ "$$file" = "httpd.conf" ]; then \
file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
fi; \
@@ -44,7 +44,7 @@
fi; \
done
-htdocs-srcdir = $(srcdir)/../htdocs
+htdocs-srcdir = docs/docroot
docs: include/*.h
mkdir -p ./docs/api
@@ -58,12 +58,12 @@
install-icons:
@echo Installing icons
@test -d $(iconsdir) || $(MKINSTALLDIRS) $(iconsdir)
- @(cd $(srcdir)/../icons && cp -rp * $(iconsdir))
+ @(cd docs/icons && cp -rp * $(iconsdir))
install-cgi:
@echo Installing CGIs
@test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
- @(cd $(srcdir)/../cgi-bin && cp -rp * $(cgidir))
+ @(cd docs/cgi-examples && cp -rp * $(cgidir))
install-support:
@echo Installing Support Binaries