Changeset 80137

Timestamp:

07/05/11 00:01:07 (4 years ago)

Author:

jmr@…

Message:

also complain about prefix=/usr

Location:

trunk/base

Files:

• configure (modified) (1 diff)
• configure.ac (modified) (1 diff)

trunk/base/configure

@@ -7646 +7646 @@
 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

trunk/base/configure.ac

@@ -177 +177 @@
                 [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.])