macports/macports-base
0
0
Fork 0
mirror of https://github.com/macports/macports-base.git synced 2026-07-12 18:18:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.macports.org/repository/macports/trunk/base@79241 d073be05-634f-4543-b044-5fe20cf6d1d6
This commit is contained in:
Joshua Root
2011-06-06 12:09:53 +00:00
parent d5ad18906b
commit 33061e78ad
6 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure
Vendored
+2 -1
View File
@@ -9627,7 +9627,7 @@ prefix=$oldprefix
# 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"
ac_config_files="$ac_config_files src/pkg_mkindex.sh"
@@ -10340,6 +10340,7 @@ do
"Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;;
"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" ;;
"doc/macports.conf") CONFIG_FILES="$CONFIG_FILES doc/macports.conf" ;;
configure.ac
+1
View File
@@ -347,6 +347,7 @@ AC_CONFIG_FILES([
Doxyfile
Makefile
Mk/macports.autoconf.mk
doc/base.mtree
doc/prefix.mtree
doc/macosx.mtree
doc/macports.conf
doc/Makefile
+4 -2
View File
@@ -17,7 +17,7 @@ clean:
test:
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
gzip -c $^ > $@
@@ -32,7 +32,8 @@ install: all
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
$(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"; \
fi
@@ -55,6 +56,7 @@ install: all
for m in ${MAN7}; do rm -f ${INSTALLDIR}/share/man/man7/$$m ; done
$(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/
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 port.1.gz ${INSTALLDIR}/share/man/man1
doc/base.mtree.in
+22
View File
@@ -0,0 +1,22 @@
# $Id$
#
# MacPorts filesystem hierarchy, for internal use only. Changes to this file will not stick across installations.
#
/set type=dir uname=@DSTUSR@ gname=@DSTGRP@ mode=@DSTMODE@
.
var
macports
build
..
distfiles
..
logs
..
registry
..
software
..
..
..
..
doc/prefix.mtree.in
-14
View File
@@ -240,20 +240,6 @@
src
..
var
macports
build
..
distfiles
..
logs
..
packages
..
receipts
..
registry
..
..
..
www
..
src/port/Makefile
+2 -1
View File
@@ -22,7 +22,8 @@ port: port.tcl ../../Mk/macports.autoconf.mk
${edit} port.tcl > $@
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:
rm -f ${SCRIPTS}