[31520] trunk/base

[jberry at macports.org]

Revision: 31520
          http://trac.macosforge.org/projects/macports/changeset/31520
Author:   jberry at macports.org
Date:     2007-11-26 21:20:02 -0800 (Mon, 26 Nov 2007)

Log Message:
-----------
Install paths files only if our prefix will be /opt/local. For all other cases, let the user be warned.

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

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2007-11-27 04:10:57 UTC (rev 31519)
+++ trunk/base/configure	2007-11-27 05:20:02 UTC (rev 31520)
@@ -12044,10 +12044,13 @@
 fi
 
 
+
 # If /etc/paths.d and /etc/manpaths.d then we can install our path configuration
-{ echo "$as_me:$LINENO: checking whether /etc/paths.d and /etc/manpaths.d exist" >&5
-echo $ECHO_N "checking whether /etc/paths.d and /etc/manpaths.d exist... $ECHO_C" >&6; }
-if test -d /etc/paths.d -a -d /etc/manpaths.d; then
+{ echo "$as_me:$LINENO: checking whether to install macports paths into /etc/paths.d and /etc/manpaths.d" >&5
+echo $ECHO_N "checking whether to install macports paths into /etc/paths.d and /etc/manpaths.d... $ECHO_C" >&6; }
+mpprefix=$prefix
+test "x$mpprefix" = "xNONE" && mpprefix=$ac_default_prefix
+if test -d /etc/paths.d -a -d /etc/manpaths.d -a "$mpprefix" = "$ac_default_prefix"; then
 	PATHCONF=pathconf
 	{ echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }

Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac	2007-11-27 04:10:57 UTC (rev 31519)
+++ trunk/base/configure.ac	2007-11-27 05:20:02 UTC (rev 31520)
@@ -294,9 +294,12 @@
 		[SDK for redirection in trace lib (for example MacOSX10.4u.sdk)]),
 	[test -d /Developer/SDKs/$withval && AC_DEFINE_UNQUOTED([TRACE_SDK], "${withval}")], [])
 	
+	
 # If /etc/paths.d and /etc/manpaths.d then we can install our path configuration
-AC_MSG_CHECKING(whether /etc/paths.d and /etc/manpaths.d directories exist)
-if test -d /etc/paths.d -a -d /etc/manpaths.d; then
+AC_MSG_CHECKING(whether to install macports paths into /etc/paths.d and /etc/manpaths.d)
+mpprefix=$prefix
+test "x$mpprefix" = "xNONE" && mpprefix=$ac_default_prefix
+if test -d /etc/paths.d -a -d /etc/manpaths.d -a "$mpprefix" = "$ac_default_prefix"; then
 	PATHCONF=pathconf
 	AC_MSG_RESULT([yes])
 else

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071126/779e45ad/attachment.html