From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 18 Oct 2008 20:17:04 +0000 (-0000)
Subject: install make.conf.example and make.globals in usr/share/portage/config/
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6d33bee5592915e016770b3d144184054aebc5ce;p=portage.git

install make.conf.example and make.globals in usr/share/portage/config/

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

diff --git a/cnf/Makefile.in b/cnf/Makefile.in
index 95296b426..3a2bf10c5 100644
--- a/cnf/Makefile.in
+++ b/cnf/Makefile.in
@@ -25,20 +25,15 @@ list_sourcedir = \
 all:
 
 install:
+	$(INSTALL) -d -m 755 -o "$(portageuser)" -g "$(portagegroup)" $(DESTDIR)$(datadir)/portage/config
+	$(INSTALL_cnfsubst) $(srcdir)/make.globals $(DESTDIR)$(datadir)/portage/config/make.globals
+	$(INSTALL_cnfsubst) $(srcdir)/make.conf $(DESTDIR)$(datadir)/portage/config/make.conf.example
+	$(INSTALL_cnfsubst) $(srcdir)/sets.conf $(DESTDIR)$(datadir)/portage/config/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/config
-	$(INSTALL_cnfsubst) $(srcdir)/sets.conf $(DESTDIR)$(datadir)/portage/config/sets.conf
+	( cd $(DESTDIR)$(sysconfdir) && ln -s $(DESTDIR)$(datadir)/portage/config/make.globals )
 	
-uninstall:
-	@ echo rm -f $(DESTDIR)$(sysconfdir)/make.conf.example \
-	; rm -f $(DESTDIR)$(sysconfdir)/make.conf.example \
-	; echo rm -f $(DESTDIR)$(sysconfdir)/make.globals \
-	; rm -f $(DESTDIR)$(sysconfdir)/make.globals \
-
 distdir:
 	$(list_sourcedir) | while read f \
 	; do echo $(INSTALL_cnf) ${srcdir}/$${f} $(distdir)/$${f} \
@@ -46,7 +41,7 @@ distdir:
 	; done
 
 all dvi check installcheck:
-clean distclean maintainer-clean:
+uninstall clean distclean maintainer-clean:
 
 .PHONY: all install distdir uninstall
 .PHONY: dvi check installcheck