From 18990d0a5b48aa1b7ff9b9106e6f9b8ede8f95c8 Mon Sep 17 00:00:00 2001
From: Ryan Bloom <rbb@apache.org>
Date: Wed, 6 Dec 2000 00:46:17 +0000
Subject: [PATCH] Get Apache installing again.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87226 13f79535-47bb-0310-9956-ffa450edef68
---
 Makefile.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index d054c669be..1c2d9fcfb9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,16 +26,16 @@ include $(top_srcdir)/build/program.mk
 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 @@ install-conf:
 		fi; \
 	done
 
-htdocs-srcdir = $(srcdir)/../htdocs
+htdocs-srcdir = docs/docroot
 
 docs: include/*.h
 	mkdir -p ./docs/api
@@ -58,12 +58,12 @@ install-htdocs:
 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
-- 
2.40.0