From: Fabian Groffen <grobian@gentoo.org>
Date: Tue, 9 Oct 2007 18:17:36 +0000 (-0000)
Subject: Install sets.conf in datarootdir/portage.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0841e738534bf07613784864c22e888c837effbc;p=portage.git

Install sets.conf in datarootdir/portage.


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

diff --git a/cnf/Makefile.in b/cnf/Makefile.in
index 7aa2c2a93..93ce5d20d 100644
--- 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 6b07b909f..faeea5921 100644
--- 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 b5af844ce..61d5658d7 100644
--- 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@"