cvs: php4 / configure.in
| From: | Stig Bakken | Date: | Sun, 22 Apr 2001 01:16:25 +0000 |
| Subject: | cvs: php4 / configure.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5182@lists.php.net to get a copy of this message | ||
ssb Sat Apr 21 18:16:25 2001 EDT
Modified files:
/php4 configure.in
Log:
* don't override $libdir and $datadir if they are specified on the
commandline
Index: php4/configure.in
diff -u php4/configure.in:1.235 php4/configure.in:1.236
--- php4/configure.in:1.235 Sat Apr 21 18:09:12 2001
+++ php4/configure.in Sat Apr 21 18:16:25 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.235 2001/04/22 01:09:12 ssb Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.236 2001/04/22 01:16:25 ssb Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -698,12 +698,12 @@
test "$prefix" = "NONE" && prefix="/usr/local"
test "$exec_prefix" = "NONE" && exec_prefix='${prefix}'
case $libdir in
- */php) ;;
- *) libdir="$libdir/php";;
+ '${exec_prefix}/lib') libdir="$libdir/php";;
+ *) ;;
esac
case $datadir in
- */php) ;;
- *) datadir="$datadir/php";;
+ '${prefix}/share') datadir="$datadir/php";;
+ *) ;;
esac
dnl Build extension directory path