[31491] trunk/base

jberry at macports.org jberry at macports.org
Sun Nov 25 13:07:30 PST 2007


Revision: 31491
          http://trac.macosforge.org/projects/macports/changeset/31491
Author:   jberry at macports.org
Date:     2007-11-25 13:07:29 -0800 (Sun, 25 Nov 2007)

Log Message:
-----------
Add support for Leopard's /etc/paths.d and /etc/manpaths.d scheme for configuration of path and manpath, however wrong-headed is the setting of MANPATH by path_helper.

Modified Paths:
--------------
    trunk/base/configure.ac
    trunk/base/src/Makefile.in

Added Paths:
-----------
    trunk/base/src/pathconf/
    trunk/base/src/pathconf/Makefile.in
    trunk/base/src/pathconf/manpaths.in
    trunk/base/src/pathconf/paths.in

Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac	2007-11-25 20:42:52 UTC (rev 31490)
+++ trunk/base/configure.ac	2007-11-25 21:07:29 UTC (rev 31491)
@@ -287,15 +287,23 @@
 AC_SUBST(SQLITE3_LIBS)
 AC_SUBST(SQLITE3_DIR)
 
-AC_SUBST(OUR_INCLUDED_PACKAGES)
-
 AH_TEMPLATE([TRACE_SDK], [SDK for SDK redirect in tracelib])
 AC_ARG_WITH(
 	trace-sdk,
 	AS_HELP_STRING([--with-trace-sdk=SDK],
 		[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
+	PATHCONF=pathconf
+	AC_MSG_RESULT([yes])
+else
+	AC_MSG_RESULT([no])
+fi
 
+
 # Allows building of shared libraries
 SC_ENABLE_SHARED
 
@@ -312,14 +320,16 @@
 AC_SUBST(INCLUDES)
 AC_SUBST(CFLAGS_DEBUG)
 AC_SUBST(CFLAGS_OPTIMIZE)
-AC_SUBST(TCL_DEFS)
+AC_SUBST(PATHCONF)
 AC_SUBST(STLIB_LD)
 AC_SUBST(SHLIB_LD)
 AC_SUBST(SHLIB_CFLAGS)
 AC_SUBST(SHLIB_LDFLAGS)
 AC_SUBST(SHLIB_SUFFIX)
+AC_SUBST(TCL_DEFS)
 AC_SUBST(TCL_STUB_LIB_SPEC)
 AC_SUBST(TCL_CC)
+AC_SUBST(OUR_INCLUDED_PACKAGES)
 
 # misc variables that need to be expanded for substitution into tcl
 
@@ -356,6 +366,9 @@
 	src/Makefile
 	src/macports1.0/macports_autoconf.tcl
 	src/tclobjc1.0/Makefile
+	src/pathconf/Makefile
+	src/pathconf/paths
+	src/pathconf/manpaths
 	src/port1.0/port_autoconf.tcl
 	src/registry1.0/registry_autoconf.tcl
 	src/programs/Makefile

Modified: trunk/base/src/Makefile.in
===================================================================
--- trunk/base/src/Makefile.in	2007-11-25 20:42:52 UTC (rev 31490)
+++ trunk/base/src/Makefile.in	2007-11-25 21:07:29 UTC (rev 31491)
@@ -8,7 +8,7 @@
 			registry2.0 \
 			darwintracelib1.0 \
 			tclobjc1.0
-SUBDIR=		${TCLPKG} port programs
+SUBDIR=		${TCLPKG} @PATHCONF@ port programs
 
 all::
 


Property changes on: trunk/base/src/pathconf
___________________________________________________________________
Name: svn:ignore
   + Makefile
paths
manpaths


Added: trunk/base/src/pathconf/Makefile.in
===================================================================
--- trunk/base/src/pathconf/Makefile.in	                        (rev 0)
+++ trunk/base/src/pathconf/Makefile.in	2007-11-25 21:07:29 UTC (rev 31491)
@@ -0,0 +1,15 @@
+# $Id: Makefile.in 26177 2007-06-15 10:11:22Z jmpp at macports.org $
+
+top_srcdir = @top_srcdir@
+
+include ${top_srcdir}/Mk/macports.autoconf.mk
+
+all:
+
+distclean::
+	rm -f Makefile manpaths paths
+
+install:
+	${INSTALL} -o root -g wheel -m 644 paths /etc/paths.d/macports
+	${INSTALL} -o root -g wheel -m 644 manpaths /etc/manpaths.d/macports
+	

Added: trunk/base/src/pathconf/manpaths.in
===================================================================
--- trunk/base/src/pathconf/manpaths.in	                        (rev 0)
+++ trunk/base/src/pathconf/manpaths.in	2007-11-25 21:07:29 UTC (rev 31491)
@@ -0,0 +1 @@
+ at prefix@/share/man

Added: trunk/base/src/pathconf/paths.in
===================================================================
--- trunk/base/src/pathconf/paths.in	                        (rev 0)
+++ trunk/base/src/pathconf/paths.in	2007-11-25 21:07:29 UTC (rev 31491)
@@ -0,0 +1 @@
+ at prefix@/bin
\ No newline at end of file

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071125/82c27a59/attachment.html


More information about the macports-changes mailing list