randy 99/05/02 09:44:25
Modified: . Makefile.tmpl
Log:
I've waffled back and forth on whether we should be processing the source
of this script at all for bindist. The whole binary distribution thing
seems somewhat bipolar.
Make this script look like what install-bindist.sh expects. Doing this
here might make paths for binary distributions somewhat more flexible.
(might)
Revision Changes Path
1.80 +4 -1 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- Makefile.tmpl 1999/05/02 14:40:36 1.79
+++ Makefile.tmpl 1999/05/02 16:42:30 1.80
@@ -384,7 +384,10 @@
apachectl="$(TARGET)ctl"; \
fi; \
echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*]
$(root)$(sbindir)/$${apachectl}"; \
- $(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl
$(root)$(sbindir)/$${apachectl}; \
+ sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/$(TARGET).pid;' \
+ -e 's;HTTPD=.*;HTTPD=$(sbindir)/$(TARGET);' \
+ < $(TOP)/$(SRC)/support/apachectl >
$(TOP)/$(SRC)/.apaci.install.tmp && \
+ $(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp
$(root)$(sbindir)/$${apachectl}; \
echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8
$(root)$(mandir)/man8/$${apachectl}.8"; \
$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8
$(root)$(mandir)/man8/$${apachectl}.8
$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/htpasswd
$(root)$(bindir)/htpasswd
Modified: src/helpers binbuild.sh
Log:
Make the install-bindist.sh script standalone. (don't require src/helpers)
This could allow us to do binary distributions without source if we choose
to.
PERL detection now makes sure it is perl5 since the 2 scripts in question
(dbmmanage and apxs) require perl5.
Fix some breakage I introduced when creating apachectl.
Revision Changes Path
1.11 +17 -8 apache-1.3/src/helpers/binbuild.sh
Index: binbuild.sh
===================================================================
RCS file: /home/cvs/apache-1.3/src/helpers/binbuild.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- binbuild.sh 1999/05/02 02:58:07 1.10
+++ binbuild.sh 1999/05/02 16:44:24 1.11
@@ -172,11 +172,20 @@
echo "##" && \
echo "## determine path to (optional) Perl interpreter" && \
echo "##" && \
- echo "PERL=no-perl-on-this-system" && \
- echo "perlpath=\"\`src/helpers/PrintPath perl5 perl miniperl\`\"" && \
- echo "if [ \"x\$perlpath\" != \"x\" ]; then" && \
- echo " PERL=\"\$perlpath\"" && \
- echo "fi" && \
+ echo "PERL=no-perl5-on-this-system" && \
+ echo "perls='perl5 perl'" && \
+ echo "path=\`echo \$PATH | sed -e 's/:/ /g'\`" && \
+ echo " " && \
+ echo "for dir in \${path} ; do" && \
+ echo " for pperl in \${perls} ; do" && \
+ echo " if test -f \"\${dir}/\${pperl}\" ; then" && \
+ echo " if \`\${dir}/\${pperl} -v | grep 'version 5\.' >/dev/null
2>&1\` ; then" && \
+ echo " PERL=\"\${dir}/\${pperl}\"" && \
+ echo " break" && \
+ echo " fi" && \
+ echo " fi" && \
+ echo " done" && \
+ echo "done" && \
echo " " && \
echo "if [ .\$1 = . ]" && \
echo "then" && \
@@ -186,7 +195,7 @@
echo "fi" && \
echo "echo \"Installing binary distribution for platform $OS\"" && \
echo "echo \"into directory \$SR ...\"" && \
- echo "./src/helpers/mkdir.sh \$SR" && \
+ echo "lmkdir \$SR 755" && \
echo "lmkdir \$SR/proxy 750" && \
echo "lmkdir \$SR/logs 750" && \
echo "lcopy bindist/man \$SR/man 755 644" && \
@@ -213,8 +222,8 @@
echo " -e \"s;[EMAIL PROTECTED]@;\$SR/libexec;\" -e \"s;[EMAIL
PROTECTED]@;\$SR/include;\" \\" && \
echo " -e \"s;[EMAIL PROTECTED]@;\$SR/conf;\" bindist/bin/apxs >
\$SR/bin/apxs" && \
echo "sed -e \"s;^#!/.*;#!\$PERL;\" bindist/bin/dbmmanage >
\$SR/bin/dbmmanage" && \
- echo "sed -e s%/usr/local/apache%\$SR/% \$SR/conf/httpd.conf.default >
\$SR/conf/httpd.conf" && \
- echo "sed -e s%PIDFILE=%PIDFILE=\$SR/% -e s%HTTPD=%HTTPD=\\\"\$SR/% -e
\"s%/httpd$%/httpd -d \$SR\\\"%\" bindist/bin/apachectl > \$SR/bin/apachectl"
&& \
+ echo "sed -e \"s%/usr/local/apache%\$SR/%\" \$SR/conf/httpd.conf.default >
\$SR/conf/httpd.conf" && \
+ echo "sed -e \"s%PIDFILE=%PIDFILE=\$SR/%\" -e
\"s%HTTPD=%HTTPD=\\\"\$SR/%\" -e \"s%httpd\$%httpd -d \$SR\\\"%\"
bindist/bin/apachectl > \$SR/bin/apachectl" && \
echo " " && \
echo "echo \"Ready.\"" && \
echo "echo \"
+--------------------------------------------------------+\"" && \
