summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlasdair G Kergon <agk@redhat.com>2015-04-28 13:02:19 +0100
committerAlasdair G Kergon <agk@redhat.com>2015-04-28 13:02:19 +0100
commitd0c46c9ed5247732e46fcb9ca4ad5be9f77a64a0 (patch)
treeec5d7331ab760e61efdbd7526a1a29fd9c73b3d7
parent71dbfd7c2077fc5d83eac37da68b55ef1a195d29 (diff)
downloadlvm2-d0c46c9ed5247732e46fcb9ca4ad5be9f77a64a0.tar.gz
conf: Avoid temp files when generating config.
-rw-r--r--conf/Makefile.in10
1 files changed, 3 insertions, 7 deletions
diff --git a/conf/Makefile.in b/conf/Makefile.in
index ee78f6aa9..c427a2e31 100644
--- a/conf/Makefile.in
+++ b/conf/Makefile.in
@@ -27,12 +27,8 @@ include $(top_builddir)/make.tmpl
.PHONY: install_conf install_localconf install_profiles
generate:
- LD_LIBRARY_PATH=$(top_builddir)/libdm:$(LD_LIBRARY_PATH) $(top_builddir)/tools/lvm dumpconfig --type default --unconfigured --withfullcomments --ignorelocal > example.conf.gen
- cat example.conf.base example.conf.gen > example.conf.in
- $(RM) example.conf.gen
- LD_LIBRARY_PATH=$(top_builddir)/libdm:$(LD_LIBRARY_PATH) $(top_builddir)/tools/lvm dumpconfig --type default --unconfigured --withfullcomments local > lvmlocal.conf.gen
- cat lvmlocal.conf.base lvmlocal.conf.gen > lvmlocal.conf.in
- $(RM) lvmlocal.conf.gen
+ (cat $(top_srcdir)/conf/example.conf.base && LD_LIBRARY_PATH=$(top_builddir)/libdm:$(LD_LIBRARY_PATH) $(top_builddir)/tools/lvm dumpconfig --type default --unconfigured --withfullcomments --ignorelocal) > example.conf.in
+ (cat $(top_srcdir)/conf/lvmlocal.conf.base && LD_LIBRARY_PATH=$(top_builddir)/libdm:$(LD_LIBRARY_PATH) $(top_builddir)/tools/lvm dumpconfig --type default --unconfigured --withfullcomments local) > lvmlocal.conf.in
install_conf: $(CONFSRC)
@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
@@ -54,4 +50,4 @@ install_lvm2: install_conf install_localconf install_profiles
install: install_lvm2
-DISTCLEAN_TARGETS += $(CONFSRC) $(CONFLOCAL) $(PROFILE_TEMPLATES) $(CONFSRC).gen $(CONFLOCAL).gen
+DISTCLEAN_TARGETS += $(CONFSRC) $(CONFLOCAL) $(PROFILE_TEMPLATES)