rse 98/12/03 02:16:46
Modified: . configure
Log:
Don't intermix the real TARGET variable with the local helper variable.
Because else TARGET is included into config.status without need and the
TARGET=xx define in src/Configuration.apaci would be set always (which is
unclean although it doesn't harm).
Revision Changes Path
1.55 +18 -14 apache-1.3/configure
Index: configure
===================================================================
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- configure 1998/12/02 09:09:16 1.54
+++ configure 1998/12/03 10:16:44 1.55
@@ -166,11 +166,6 @@
## determine default parameters
##
-# target name
-if [ ".$TARGET" = . ]; then
- TARGET=httpd
-fi
-
# default paths
prefix=UNSET
@@ -833,6 +828,15 @@
fi
##
+## target name
+##
+if [ ".$TARGET" != . ]; then
+ thetarget=$TARGET
+else
+ thetarget=httpd
+fi
+
+##
## expand path variables and make sure
## they do not end with a backslash
##
@@ -933,13 +937,13 @@
echo "Compilation paths:"
echo " HTTPD_ROOT: $prefix"
echo " SHARED_CORE_DIR: $libexecdir"
- echo " DEFAULT_PIDLOG: ${runtimedir_relative}${TARGET}.pid"
- echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${TARGET}.scoreboard"
- echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${TARGET}.lock"
+ echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
+ echo " DEFAULT_SCOREBOARD:
${runtimedir_relative}${thetarget}.scoreboard"
+ echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
- echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${TARGET}.conf"
+ echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
echo " RESOURCE_CONFIG_FILE: ${sysconfdir_relative}srm.conf"
echo ""
@@ -970,7 +974,7 @@
-e "[EMAIL PROTECTED]@%$src%g" \
-e "[EMAIL PROTECTED]@%$mkf%g" \
-e "[EMAIL PROTECTED]@%$aux%g" \
--e "[EMAIL PROTECTED]@%$TARGET%g" \
+-e "[EMAIL PROTECTED]@%$thetarget%g" \
-e "[EMAIL PROTECTED]@%$prefix%g" \
-e "[EMAIL PROTECTED]@%$exec_prefix%g" \
-e "[EMAIL PROTECTED]@%$bindir%g" \
@@ -1013,13 +1017,13 @@
echo "echo '-DHTTPD_ROOT=\"$prefix\"'" >>$src/apaci
echo "echo '-DSUEXEC_BIN=\"$sbindir/suexec\"'" >>$src/apaci
echo "echo '-DSHARED_CORE_DIR=\"$libexecdir\"'" >>$src/apaci
-echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${TARGET}.pid\"'"
>>$src/apaci
-echo "echo
'-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${TARGET}.scoreboard\"'"
>>$src/apaci
-echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${TARGET}.lock\"'"
>>$src/apaci
+echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'"
>>$src/apaci
+echo "echo
'-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'"
>>$src/apaci
+echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'"
>>$src/apaci
echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'"
>>$src/apaci
echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'"
>>$src/apaci
echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'"
>>$src/apaci
-echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${TARGET}.conf\"'"
>>$src/apaci
+echo "echo
'-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.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
