rse 98/04/15 03:03:47
Modified: . configure
Log:
Last minute fix: Be even more friendly and conservative: Only append the
"/apache" prefix to installation paths when the PREFIX does not contain it
_AND_ the user didn't customize it via explicit options.
Revision Changes Path
1.10 +16 -1 apache-1.3/configure
Index: configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- configure 1998/04/15 06:23:08 1.9
+++ configure 1998/04/15 10:03:46 1.10
@@ -141,6 +141,13 @@
localstatesubdir_logs='logs'
includedir='$prefix/include'
+# customization flags for
+# automatic "apache" suffix
+customized_sysconfdir=0
+customized_datadir=0
+customized_localstatedir=0
+customized_includedir=0
+
# check and debug
layout=0
@@ -324,15 +331,19 @@
;;
--sysconfdir=*)
sysconfdir="$apc_optarg"
+ customized_sysconfdir=1
;;
--datadir=*)
datadir="$apc_optarg"
+ customized_datadir=1
;;
--localstatedir=*)
localstatedir="$apc_optarg"
+ customized_localstatedir=1
;;
--includedir=*)
includedir="$apc_optarg"
+ customized_includedir=1
;;
--compat)
prefix='/usr/local/apache'
@@ -600,7 +611,11 @@
eval "val=\$$var"
case $val in
*apache | *apache* ) ;;
- * ) eval "$var=\$$var/apache" ;;
+ * ) eval "customized=\$customized_$var"
+ if [ ".$customized" = .0 ]; then
+ eval "$var=\$$var/apache"
+ fi
+ ;;
esac
;;
esac
