[80137] trunk/base

[jmr at macports.org]

Revision: 80137
          http://trac.macports.org/changeset/80137
Author:   jmr at macports.org
Date:     2011-07-05 00:01:07 -0700 (Tue, 05 Jul 2011)
Log Message:
-----------
also complain about prefix=/usr

Modified Paths:
--------------
    trunk/base/configure
    trunk/base/configure.ac

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2011-07-05 06:58:19 UTC (rev 80136)
+++ trunk/base/configure	2011-07-05 07:01:07 UTC (rev 80137)
@@ -7645,8 +7645,8 @@
   with_unsupported_prefix=no
 fi
 
-if test x$prefix = x/usr/local -a x$with_unsupported_prefix != xyes; then
-    as_fn_error $? "Installing MacPorts into /usr/local is not supported. If \
+if test x$prefix = x/usr/local -o x$prefix = x/usr && test x$with_unsupported_prefix != xyes; then
+    as_fn_error $? "Installing MacPorts into $prefix is not supported. If \
 you understand this and wish to do so anyway, pass --with-unsupported-prefix \
 to configure." "$LINENO" 5
 fi

Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac	2011-07-05 06:58:19 UTC (rev 80136)
+++ trunk/base/configure.ac	2011-07-05 07:01:07 UTC (rev 80137)
@@ -176,8 +176,8 @@
 		[Acknowledge that you accept the consequences of using an unsupported prefix.]),
 		[with_unsupported_prefix=$withval],
 		[with_unsupported_prefix=no])
-if test x$prefix = x/usr/local -a x$with_unsupported_prefix != xyes; then
-    AC_MSG_ERROR([Installing MacPorts into /usr/local is not supported. If \
+if test x$prefix = x/usr/local -o x$prefix = x/usr && test x$with_unsupported_prefix != xyes; then
+    AC_MSG_ERROR([Installing MacPorts into $prefix is not supported. If \
 you understand this and wish to do so anyway, pass --with-unsupported-prefix \
 to configure.])
 fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110705/36d4d8f3/attachment.html>