aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Erdmann <dywi@mailerd.de>2013-09-18 15:59:05 +0200
committerAndré Erdmann <dywi@mailerd.de>2013-09-18 15:59:05 +0200
commit7eb9c2a37ff93cfec565d034481c79dc21323a79 (patch)
tree14451620ea74cfe04ccd336c9ce4a2466708b7a6 /Makefile
parentfix 4502c63561b4e6390ecc7457d11c4fc1c15e2829 (diff)
downloadR_overlay-7eb9c2a37ff93cfec565d034481c79dc21323a79.tar.gz
R_overlay-7eb9c2a37ff93cfec565d034481c79dc21323a79.tar.bz2
R_overlay-7eb9c2a37ff93cfec565d034481c79dc21323a79.zip
Makefile: fix generate-config
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile17
1 files 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