httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Ralf S. Engelschall" <...@engelschall.com>
Subject httpd-docs-1.3 module
Date Sun, 16 Jul 2000 10:12:30 GMT

Although I think it was reasonable to place the documentation from
apache-1.3/htdocs/ into a new module httpd-docs-1.3/, I think too much was
done.  Actuallly only apache-1.3/htdocs/manual/ should have become
httpd-docs-1.3/ and the old apache-1.3/htdocs/index.html* files should have
been kept. Because currently for non-release versions one gets an error under
"make install" because htdocs/ is not longer present. That could be ok, but
what is nasty is this way a test page is no longer available. I install Apache
a lot into temporary directories, fire it up and perform a "GET / HTTP/1.0" in
port 80 for quick testing. This is now broken. So I recommend to move back the
httpd-docs-1.3/htdocs/index.html* files into apache-1.3/htdocs/.

Or at least let us commit the following patch:

Index: Makefile.tmpl
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/Makefile.tmpl,v
retrieving revision 1.96
diff -u -d -r1.96 Makefile.tmpl
--- Makefile.tmpl	2000/04/13 19:08:25	1.96
+++ Makefile.tmpl	2000/07/16 10:07:11
@@ -455,9 +455,21 @@
 	-@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ];
then \
 		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
 	else \
-		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
-		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
-		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
+		if [ -d "$(TOP)/htdocs" ]; then \
+			echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
+			(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
+			(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
+		else \
+			echo "Creating dummy page in $(root)$(htdocsdir)/"; \
+			(echo "<html>"; \
+			 echo "<title>Placeholder Page</title>"; \
+			 echo "<body>"; \
+			 echo "<h1>Placeholder Page</h1>"; \
+			 echo "This is a placeholder for the httpd-docs-1.3 module</h1>"; \
+			 echo "</body>"; \
+			 echo "</html>"; \
+			) >$(root)$(htdocsdir)/index.html; \
+		fi; \
 		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
 		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
 	fi

Yours,
                                       Ralf S. Engelschall
                                       rse@engelschall.com
                                       www.engelschall.com

Mime
View raw message