mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-27 21:29:02 +00:00
51 lines
1.4 KiB
Plaintext
51 lines
1.4 KiB
Plaintext
--- configure.orig Wed Apr 4 12:45:36 2001
|
|
+++ configure Sat Apr 14 18:25:08 2001
|
|
@@ -3760,7 +3760,9 @@
|
|
-e "s/[ ]*$/'/g" \
|
|
$srcdir/config.layout > $pldconf
|
|
layout_name=$LAYOUT
|
|
+ prefix_backup=$prefix # poor patch to prevent override prefix arg with default
|
|
. $pldconf
|
|
+ prefix=$prefix_backup
|
|
rm $pldconf
|
|
for var in prefix exec_prefix bindir sbindir libexecdir mandir \
|
|
sysconfdir datadir iconsdir htdocsdir cgidir includedir \
|
|
@@ -3777,7 +3779,7 @@
|
|
;;
|
|
esac
|
|
val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
|
|
- val=`echo $val | sed -e 's:$\([a-z_]*\):$(\1):g'`
|
|
+ val=`echo $val | sed -e 's:$\([a-z_]*\):${\1}:g'`
|
|
if test "$autosuffix" = "yes"; then
|
|
if echo $val | grep apache >/dev/null; then
|
|
addtarget=no
|
|
@@ -3788,7 +3790,7 @@
|
|
val="$val/apache"
|
|
fi
|
|
fi
|
|
- eval "$var='$val'"
|
|
+ eval "$var=\"$val\""
|
|
done
|
|
|
|
|
|
@@ -9678,6 +9680,10 @@
|
|
|
|
|
|
APACHE_VAR_SUBST="$APACHE_VAR_SUBST sysconfdir"
|
|
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST runtimedir"
|
|
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST logfiledir"
|
|
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST mandir"
|
|
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST libdir"
|
|
|
|
|
|
|
|
@@ -9814,7 +9820,7 @@
|
|
EOF
|
|
|
|
cat >> confdefs.h <<EOF
|
|
-#define SERVER_CONFIG_FILE "conf/$progname.conf"
|
|
+#define SERVER_CONFIG_FILE "etc/apache/$progname.conf"
|
|
EOF
|
|
|
|
cat >> confdefs.h <<EOF
|