[gentoo-commits] proj/R_overlay:master commit in: /

["André Erdmann" <dywi@mailerd.de>]

commit:     7eb9c2a37ff93cfec565d034481c79dc21323a79
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Sep 18 13:59:05 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Sep 18 13:59:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=7eb9c2a3

Makefile: fix generate-config

---
 Makefile | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 1c18f2a..4f2c60e 100644
--- a/Makefile
+++ b/Makefile
@@ -98,19 +98,22 @@ generate-manifest: $(MANIFEST_GEN)
 	mv -- $(MANIFEST_TMP) $(MANIFEST)
 
 generate-config: $(RV_SETUP)
-	ROVERLAY_INSTALLED=1 $(RV_SETUP) mkconfig \
+	ROVERLAY_INSTALLED=1 $(RV_SETUP) \
 		-O config/R-overlay.conf.install \
 		-D $(DATADIR)/roverlay \
 		--conf-root $(CONFDIR)/roverlay --my-conf-root $(CONFDIR)/roverlay \
-		-A $(CONFDIR)/roverlay/files
+		-A $(CONFDIR)/roverlay/files \
+		mkconfig
 
-	ROVERLAY_INSTALLED=0 $(RV_SETUP) mkconfig \
+	ROVERLAY_INSTALLED=0 $(RV_SETUP) \
 		-O R-overlay.conf --prjroot-relpath \
-		-D files --conf-root config --my-conf-root config -A files -W workdir
+		-D files --conf-root config --my-conf-root config -A files -W workdir \
+		mkconfig
 
-	ROVERLAY_INSTALLED=0 $(RV_SETUP) mkconfig \
-		-O R-overlay.conf.local \
-		-D files --conf-root config --my-conf-root config -A files -W workdir
+	ROVERLAY_INSTALLED=0 $(RV_SETUP) \
+		-O R-overlay.conf.local.new \
+		-D files --conf-root config --my-conf-root config -A files -W workdir \
+		mkconfig
 
 
 generate-files: generate-config generate-doc generate-manifest