Fix up installing of sets.conf

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

diff --git a/cnf/Makefile.in b/cnf/Makefile.in
index f8f428092bf24bb56ff6bc6fd8d1feb65928c0c7..abed232687303e5ae799e74ace05c14531d237ec 100644 (file)
--- a/cnf/Makefile.in
+++ b/cnf/Makefile.in
@@ -1,5 +1,5 @@
 sysconfdir = @sysconfdir@
-datarootdir = @datarootdir@
+datadir = @datadir@
 DEFAULT_PATH = @DEFAULT_PATH@
 ARCH = @ARCH@
 
@@ -20,24 +20,18 @@ 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:
 
 install:
-       $(INSTALL) -d -m 755 -o $(portageuser) -g $(portagegroup) $(DESTDIR)$(sysconfdir) \
-       ; echo "$(INSTALL_cnfsubst) $(srcdir)/make.globals $(DESTDIR)$(sysconfdir)/make.globals" \
-       ; $(INSTALL_cnfsubst) $(srcdir)/make.globals $(DESTDIR)$(sysconfdir)/make.globals \
-       ; echo "$(INSTALL_cnfsubst) $(srcdir)/make.conf $(DESTDIR)$(sysconfdir)/make.conf.example" \
-       ; $(INSTALL_cnfsubst) $(srcdir)/make.conf $(DESTDIR)$(sysconfdir)/make.conf.example \
-       ; 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) -d -m 755 -o $(portageuser) -g $(portagegroup) $(DESTDIR)$(datarootdir)/portage \
-       ; echo "$(INSTALL_cnfsubst) $(srcdir)/sets.conf $(DESTDIR)$(datarootdir)/portage/sets.conf" \
-       ; $(INSTALL_cnfsubst) $(srcdir)/sets.conf $(DESTDIR)$(datarootdir)/portage/sets.conf
+       $(INSTALL) -d -m 755 -o $(portageuser) -g $(portagegroup) $(DESTDIR)$(sysconfdir)
+       $(INSTALL_cnfsubst) $(srcdir)/make.globals $(DESTDIR)$(sysconfdir)/make.globals
+       $(INSTALL_cnfsubst) $(srcdir)/make.conf $(DESTDIR)$(sysconfdir)/make.conf.example
+       $(INSTALL_cnfsubst) $(srcdir)/dispatch-conf.conf $(DESTDIR)$(sysconfdir)/dispatch-conf.conf
+       $(INSTALL_cnfsubst) $(srcdir)/etc-update.conf $(DESTDIR)$(sysconfdir)/etc-update.conf
+       $(INSTALL) -d -m 755 -o $(portageuser) -g $(portagegroup) $(DESTDIR)$(datadir)/portage
+       $(INSTALL_cnfsubst) $(srcdir)/sets.conf $(DESTDIR)$(datadir)/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 faeea5921fcb974571cbf7b0a2ae90791406fe10..46a27e2c52247f12ff5926f903fa01da8ecab7c1 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      = DATAROOTDIR+"/portage/config"
+GLOBAL_CONFIG_PATH      = DATADIR+"/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 61d5658d700049e78506a01f894178090e30a741..a0e633652a775dec1303988d16cb0db643cdbcf6 100644 (file)
--- a/pym/portage/const_autotool.py
+++ b/pym/portage/const_autotool.py
@@ -4,14 +4,14 @@
 
 # all vars that are to wind up in portage_const must have their name listed in __all__
 
-__all__ = ["EPREFIX", "SYSCONFDIR", "DATAROOTDIR", "PORTAGE_BASE",
+__all__ = ["EPREFIX", "SYSCONFDIR", "DATADIR", "PORTAGE_BASE",
                "portageuser", "portagegroup", "rootuser", "rootuid"]
 
 from os import path
 
 EPREFIX=path.normpath("@DOMAIN_PREFIX@")
 SYSCONFDIR=path.normpath("@sysconfdir@")
-DATAROOTDIR=path.normpath("@datarootdir@")
+DATADIR=path.normpath("@datadir@")
 PORTAGE_BASE=path.normpath("@PORTAGE_BASE@")
 portagegroup="@portagegroup@"
 portageuser="@portageuser@"