rse 98/07/25 05:43:21
Modified: src CHANGES
. Makefile.tmpl
Log:
Make sure that the path to the Perl interpreter is correctly
adjusted under `make install' also for the printenv CGI script.
NOTICE: I still used INSTALL_DATA instead of INSTALL_SCRIPT because some of us
still thing we should install even these trivial shell scripts without execute
permissions. Even when we also have CGI's disabled in the default config.
What's the latest state? Should we change INSTALL_DATA to INSTALL_SCRIPT or is
double-paranoia really necessary?
PR: 2595
Revision Changes Path
1.987 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.986
retrieving revision 1.987
diff -u -r1.986 -r1.987
--- CHANGES 1998/07/25 12:16:35 1.986
+++ CHANGES 1998/07/25 12:43:18 1.987
@@ -1,4 +1,8 @@
Changes with Apache 1.3.2
+
+ *) Make sure that the path to the Perl interpreter is correctly
+ adjusted under `make install' also for the printenv CGI script.
+ [Ralf S. Engelschall] PR#2595
*) Update the mod_rewrite.html document to correctly reflect the situation
of the `proxy' (`[P]') feature. [Ralf S. Engelschall] PR#2679
1.44 +7 -5 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Makefile.tmpl 1998/07/25 11:56:30 1.43
+++ Makefile.tmpl 1998/07/25 12:43:20 1.44
@@ -350,11 +350,13 @@
[EMAIL PROTECTED] [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
echo "[PRESERVING EXISTING DATA SUBDIR:
$(root)$(datadir)/cgi-bin/]"; \
else \
- echo "Copying tree $(TOP)/cgi-bin/ ->
$(root)$(datadir)/cgi-bin/"; \
- (cd $(TOP)/cgi-bin/ && $(TAR) cf - *) |\
- (cd $(root)$(datadir)/cgi-bin/ && $(TAR) xf -); \
- find $(root)$(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \;
; \
- find $(root)$(datadir)/cgi-bin/ -type f -exec chmod a+r {} \; ;
\
+ for script in printenv test-cgi; do \
+ cat $(TOP)/cgi-bin/$${script} |\
+ sed -e 's;^#!/.*perl;#!$(PERL);' \
+ > $(TOP)/$(SRC)/.apaci.install.tmp; \
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*]
$(root)$(datadir)/cgi-bin/$${script}"; \
+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp
$(root)$(datadir)/cgi-bin/$${script}; \
+ done; \
fi
@echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
(cd $(TOP)/icons/ && $(TAR) cf - *) |\
