Install sets.conf in datarootdir/portage.

svn path=/main/branches/prefix/; revision=8020

diff --git a/cnf/Makefile.in b/cnf/Makefile.in
index 7aa2c2a93a161330f820ba0a3fafbb5b24200931..93ce5d20d8eb2ca7ee378e1f7ff27ed7dd88a05d 100644 (file)
--- a/cnf/Makefile.in
+++ b/cnf/Makefile.in
@@ -19,6 +19,7 @@ list_sourcedir = \
                   -o -name 'make.*' -type f -print \
                   -o -name 'dispatch-conf.conf' -type f -print \
                   -o -name 'etc-update.conf' -type f -print \
+                  -o -name 'sets.conf' -type f -print \
         )
 
 all:
@@ -32,7 +33,9 @@ install:
        ; echo "$(INSTALL_cnfsubst) $(srcdir)/dispatch-conf.conf $(DESTDIR)$(sysconfdir)/dispatch-conf.conf" \
        ; $(INSTALL_cnfsubst) $(srcdir)/dispatch-conf.conf $(DESTDIR)$(sysconfdir)/dispatch-conf.conf \
        ; echo "$(INSTALL_cnfsubst) $(srcdir)/etc-update.conf $(DESTDIR)$(sysconfdir)/etc-update.conf" \
-       ; $(INSTALL_cnfsubst) $(srcdir)/etc-update.conf $(DESTDIR)$(sysconfdir)/etc-update.conf
+       ; $(INSTALL_cnfsubst) $(srcdir)/etc-update.conf $(DESTDIR)$(sysconfdir)/etc-update.conf \
+       ; echo "$(INSTALL_cnfsubst) $(srcdir)/sets.conf $(DESTDIR)$(datarootdir)/portage/sets.conf" \
+       ; $(INSTALL_cnfsubst) $(srcdir)/sets.conf $(DESTDIR)$(datarootdir)/portage/sets.conf
        
 uninstall:
        @ echo rm -f $(DESTDIR)$(sysconfdir)/make.conf.example \

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 6b07b909f1a05b2c1984edf22e68375809b6564a..faeea5921fcb974571cbf7b0a2ae90791406fe10 100644 (file)
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -24,7 +24,7 @@ DEPCACHE_PATH           = CACHE_PATH+"/dep"
 USER_CONFIG_PATH        = EPREFIX+"/etc/portage"
 MODULES_FILE_PATH       = USER_CONFIG_PATH+"/modules"
 CUSTOM_PROFILE_PATH     = USER_CONFIG_PATH+"/profile"
-GLOBAL_CONFIG_PATH      = EPREFIX+"/usr/share/portage/config"
+GLOBAL_CONFIG_PATH      = DATAROOTDIR+"/portage/config"
 
 PORTAGE_BASE_PATH       = PORTAGE_BASE
 PORTAGE_BIN_PATH        = PORTAGE_BASE_PATH+"/bin"

diff --git a/pym/portage/const_autotool.py b/pym/portage/const_autotool.py
index b5af844ced1dc66a93d27168fd0ca5545900adfc..61d5658d700049e78506a01f894178090e30a741 100644 (file)
--- a/pym/portage/const_autotool.py
+++ b/pym/portage/const_autotool.py
@@ -4,13 +4,14 @@
 
 # all vars that are to wind up in portage_const must have their name listed in __all__
 
-__all__ = ["EPREFIX", "SYSCONFDIR", "PORTAGE_BASE", "portageuser",
-               "portagegroup", "rootuser", "rootuid"]
+__all__ = ["EPREFIX", "SYSCONFDIR", "DATAROOTDIR", "PORTAGE_BASE",
+               "portageuser", "portagegroup", "rootuser", "rootuid"]
 
 from os import path
 
 EPREFIX=path.normpath("@DOMAIN_PREFIX@")
 SYSCONFDIR=path.normpath("@sysconfdir@")
+DATAROOTDIR=path.normpath("@datarootdir@")
 PORTAGE_BASE=path.normpath("@PORTAGE_BASE@")
 portagegroup="@portagegroup@"
 portageuser="@portageuser@"