Changeset 79241

Timestamp:

06/06/11 05:09:53 (4 years ago)

Author:

jmr@…

Message:

separate dirs used only by base into another mtree file, so ports that install files there will trigger the warning

Location:

trunk/base

Files:

• configure (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• doc/Makefile (modified) (3 diffs)
• doc/base.mtree.in (added)
• doc/prefix.mtree.in (modified) (1 diff)
• src/port/Makefile (modified) (1 diff)

trunk/base/configure

@@ -9628 +9628 @@
 
 # Output
-ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf doc/pubkeys.conf portmgr/freebsd/Makefile src/Makefile src/macports1.0/macports_autoconf.tcl src/port1.0/port_autoconf.tcl src/registry2.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl setupenv.bash"
+ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/base.mtree doc/prefix.mtree doc/macosx.mtree doc/macports.conf doc/pubkeys.conf portmgr/freebsd/Makefile src/Makefile src/macports1.0/macports_autoconf.tcl src/port1.0/port_autoconf.tcl src/registry2.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl setupenv.bash"
 
 
@@ -10341 +10341 @@
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "Mk/macports.autoconf.mk") CONFIG_FILES="$CONFIG_FILES Mk/macports.autoconf.mk" ;;
+    "doc/base.mtree") CONFIG_FILES="$CONFIG_FILES doc/base.mtree" ;;
     "doc/prefix.mtree") CONFIG_FILES="$CONFIG_FILES doc/prefix.mtree" ;;
     "doc/macosx.mtree") CONFIG_FILES="$CONFIG_FILES doc/macosx.mtree" ;;

trunk/base/configure.ac

@@ -348 +348 @@
         Makefile
         Mk/macports.autoconf.mk
+        doc/base.mtree
         doc/prefix.mtree
         doc/macosx.mtree

trunk/base/doc/Makefile

@@ -18 +18 @@
 
 distclean: clean
-        rm -f macports.conf macosx.mtree prefix.mtree pubkeys.conf
+        rm -f macports.conf base.mtree macosx.mtree prefix.mtree pubkeys.conf
 
 %.1.gz: %.1
@@ -33 +33 @@
         $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${mpconfigdir}
 
-        <prefix.mtree $(MTREE) -U -e -p ${INSTALLDIR} > /dev/null
+        < prefix.mtree $(MTREE) -U -e -p ${INSTALLDIR} > /dev/null
+        < base.mtree $(MTREE) -U -e -p ${INSTALLDIR} > /dev/null
         if test -L "${INSTALLDIR}/man" ; then \
                 rm -f "${INSTALLDIR}/man"; \
@@ -56 +57 @@
 
         $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/share/macports/install
+        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 base.mtree ${INSTALLDIR}/share/macports/install/
         $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree ${INSTALLDIR}/share/macports/install/
         $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 macosx.mtree ${INSTALLDIR}/share/macports/install/

trunk/base/doc/prefix.mtree.in

@@ -241 +241 @@
     ..
     var
-        macports
-            build
-            ..
-            distfiles
-            ..
-            logs
-            ..
-            packages
-            ..
-            receipts
-            ..
-            registry
-            ..
-        ..
     ..
     www

trunk/base/src/port/Makefile

@@ -23 +23 @@
 
 mkdirs:
-        <../../doc/prefix.mtree $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null
+        < ../../doc/prefix.mtree $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null
+        < ../../doc/base.mtree $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null
 
 clean: