rse 98/03/30 07:42:20
Modified: . Makefile.tmpl configure
Log:
Make APACI even a little bit more robust and friendly:
- make sure the user can also say --prefix=/path/ instead
of the expected one --prefix=/path. Same for all other
path options.
- allow relative path for the auto-generated LoadModule
directives because mod_so already supports this.
Revision Changes Path
1.2 +2 -1 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.tmpl 1998/03/29 12:27:29 1.1
+++ Makefile.tmpl 1998/03/30 15:42:18 1.2
@@ -91,6 +91,7 @@
datadir = @datadir@
localstatedir = @localstatedir@
+libexecdir_relative = @libexecdir_relative@
localstatesubdir_run = @localstatesubdir_run@
localstatesubdir_logs = @localstatesubdir_logs@
@@ -215,7 +216,7 @@
echo dummy | awk '{ printf("%sLoadModule %-18s %s\n", \
prefix, modname, modpath); }' \
prefix="$$prefix" modname="$$name" \
- modpath="$(libexecdir)/$$file" >>.install.conf;
\
+ modpath="$(libexecdir_relative)$$file"
>>.install.conf; \
done; \
fi
@echo "<=== [programs]"
1.2 +35 -27 apache-1.3/configure
Index: configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure 1998/03/29 12:27:28 1.1
+++ configure 1998/03/30 15:42:18 1.2
@@ -567,13 +567,15 @@
fi
##
-## expand path variables
+## expand path variables and make sure
+## they do not end with a backslash
##
IFS=' '
-for var in exec_prefix bindir sbindir \
+for var in prefix exec_prefix bindir sbindir \
libexecdir mandir sysconfdir datadir localstatedir; do
eval "val=\$$var";
- eval "$var=\"$val$subdir\""
+ val=`echo $val | sed -e 's:/*$::'`
+ eval "$var=\"$val\""
case $var in
sysconfdir|datadir|localstatedir )
eval "val=\$$var"
@@ -586,12 +588,17 @@
done
##
-## determine the compile-time defaults for the config files
-## under sysconfdir where Apache supports prefix-relative paths
-## for maximum flexibility (e.g. to use the -d option with -f)
-##
-localstatedir_compile=`echo $localstatedir | sed -e "s:^$prefix/*::" -e
's:\(.\)$:\1/:'`
-sysconfdir_compile=`echo $sysconfdir | sed -e "s:^$prefix/*::" -e
's:\(.\)$:\1/:'`
+## determine prefix-relative paths for directories
+## because Apache supports them for the -d and -f
+## options, the LoadModule directive, etc.
+##
+## [we have to make sure that it ends with a slash
+## or we cannot support the case where the relative
+## path is just the emtpy one, i.e. ""]
+##
+localstatedir_relative=`echo $localstatedir | sed -e "s:^$prefix/*::" -e
's:\(.\)$:\1/:'`
+sysconfdir_relative=`echo $sysconfdir | sed -e "s:^$prefix/*::" -e
's:\(.\)$:\1/:'`
+libexecdir_relative=`echo $libexecdir | sed -e "s:^$prefix/*::" -e
's:\(.\)$:\1/:'`
##
## check and debug
@@ -612,15 +619,15 @@
echo "Compilation paths:"
echo " HTTPD_ROOT: $prefix"
echo " SUEXEC_BIN: $sbindir/suexec"
- echo " DEFAULT_PIDLOG:
${localstatedir_compile}${localstatesubdir_run}/httpd.pid"
- echo " DEFAULT_SCOREBOARD:
${localstatedir_compile}${localstatesubdir_run}/httpd.scoreboard"
- echo " DEFAULT_LOCKFILE:
${localstatedir_compile}${localstatesubdir_run}/httpd.lock"
- echo " DEFAULT_XFERLOG:
${localstatedir_compile}${localstatesubdir_logs}/access_log"
- echo " DEFAULT_ERRORLOG:
${localstatedir_compile}${localstatesubdir_logs}/error_log"
- echo " TYPES_CONFIG_FILE: ${sysconfdir_compile}mime.types"
- echo " SERVER_CONFIG_FILE: ${sysconfdir_compile}httpd.conf"
- echo " ACCESS_CONFIG_FILE: ${sysconfdir_compile}access.conf"
- echo " RESOURCE_CONFIG_FILE: ${sysconfdir_compile}srm.conf"
+ echo " DEFAULT_PIDLOG:
${localstatedir_relative}${localstatesubdir_run}/httpd.pid"
+ echo " DEFAULT_SCOREBOARD:
${localstatedir_relative}${localstatesubdir_run}/httpd.scoreboard"
+ echo " DEFAULT_LOCKFILE:
${localstatedir_relative}${localstatesubdir_run}/httpd.lock"
+ echo " DEFAULT_XFERLOG:
${localstatedir_relative}${localstatesubdir_logs}/access_log"
+ echo " DEFAULT_ERRORLOG:
${localstatedir_relative}${localstatesubdir_logs}/error_log"
+ echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
+ echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf"
+ echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
+ echo " RESOURCE_CONFIG_FILE: ${sysconfdir_relative}srm.conf"
echo ""
exit 0
fi
@@ -642,6 +649,7 @@
-e "[EMAIL PROTECTED]@%$bindir%g" \
-e "[EMAIL PROTECTED]@%$sbindir%g" \
-e "[EMAIL PROTECTED]@%$libexecdir%g" \
+-e "[EMAIL PROTECTED]@%$libexecdir_relative%g" \
-e "[EMAIL PROTECTED]@%$mandir%g" \
-e "[EMAIL PROTECTED]@%$sysconfdir%g" \
-e "[EMAIL PROTECTED]@%$datadir%g" \
@@ -662,15 +670,15 @@
echo "## WITHOUT DISTURBING THE KNOWN MAKE BUILD PROCESS DISPLAY"
>>$src/apaci
echo "echo '-DHTTPD_ROOT=\"$prefix\"'" >>$src/apaci
echo "echo '-DSUEXEC_BIN=\"$sbindir/suexec\"'" >>$src/apaci
-echo "echo
'-DDEFAULT_PIDLOG=\"${localstatedir_compile}${localstatesubdir_run}/httpd.pid\"'"
>>$src/apaci
-echo "echo
'-DDEFAULT_SCOREBOARD=\"${localstatedir_compile}${localstatesubdir_run}/httpd.scoreboard\"'"
>>$src/apaci
-echo "echo
'-DDEFAULT_LOCKFILE=\"${localstatedir_compile}${localstatesubdir_run}/httpd.lock\"'"
>>$src/apaci
-echo "echo
'-DDEFAULT_XFERLOG=\"${localstatedir_compile}${localstatesubdir_logs}/access_log\"'"
>>$src/apaci
-echo "echo
'-DDEFAULT_ERRORLOG=\"${localstatedir_compile}${localstatesubdir_logs}/error_log\"'"
>>$src/apaci
-echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_compile}mime.types\"'"
>>$src/apaci
-echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_compile}httpd.conf\"'"
>>$src/apaci
-echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_compile}access.conf\"'"
>>$src/apaci
-echo "echo '-DRESOURCE_CONFIG_FILE=\"${sysconfdir_compile}srm.conf\"'"
>>$src/apaci
+echo "echo
'-DDEFAULT_PIDLOG=\"${localstatedir_relative}${localstatesubdir_run}/httpd.pid\"'"
>>$src/apaci
+echo "echo
'-DDEFAULT_SCOREBOARD=\"${localstatedir_relative}${localstatesubdir_run}/httpd.scoreboard\"'"
>>$src/apaci
+echo "echo
'-DDEFAULT_LOCKFILE=\"${localstatedir_relative}${localstatesubdir_run}/httpd.lock\"'"
>>$src/apaci
+echo "echo
'-DDEFAULT_XFERLOG=\"${localstatedir_relative}${localstatesubdir_logs}/access_log\"'"
>>$src/apaci
+echo "echo
'-DDEFAULT_ERRORLOG=\"${localstatedir_relative}${localstatesubdir_logs}/error_log\"'"
>>$src/apaci
+echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'"
>>$src/apaci
+echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'"
>>$src/apaci
+echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'"
>>$src/apaci
+echo "echo '-DRESOURCE_CONFIG_FILE=\"${sysconfdir_relative}srm.conf\"'"
>>$src/apaci
chmod a+x $src/apaci
CFLAGS="$CFLAGS \\\`\$(SRCDIR)/apaci\\\`"
