diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2012-09-19 10:48:47 -0400 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2012-11-27 15:16:15 +1000 |
| commit | ded25aeb98caf32c32e7cae8c2fc3a1d23cf111e (patch) | |
| tree | c82d4c096ec7b422759a34fd633a8b997734cbe6 | |
| parent | 40d68949100d534e4dea766c7f8f60ed36aa4429 (diff) | |
| download | pacman-ded25aeb98caf32c32e7cae8c2fc3a1d23cf111e.tar.xz | |
etc/Makefile: simplify build rule for conf files
This lets us define the build rule and the dependency all at once, and
additionally removes the need for an intermediate temp file.
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | etc/Makefile.am | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/etc/Makefile.am b/etc/Makefile.am index 58a80bdc..7a1b91bd 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -4,8 +4,9 @@ EXTRA_DIST = makepkg.conf.in pacman.conf.in # Files that should be removed, but which Automake does not know. MOSTLYCLEANFILES = $(dist_sysconf_DATA) -#### Taken from the autoconf scripts Makefile.am #### -edit = sed \ +SED_PROCESS = \ + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ + $(SED) \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@prefix[@]|$(prefix)|g' \ @@ -19,14 +20,10 @@ edit = sed \ -e 's|@CARCH[@]|$(CARCH)|g' \ -e 's|@CHOST[@]|$(CHOST)|g' \ -e 's|@ARCHSWITCH[@]|$(ARCHSWITCH)|g' \ - -e 's|@ROOTDIR[@]|$(ROOTDIR)|g' + -e 's|@ROOTDIR[@]|$(ROOTDIR)|g' \ + < $< > $@ -$(dist_sysconf_DATA): Makefile - $(AM_V_at)$(RM) $@ $@.tmp - $(AM_V_GEN)$(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp - $(AM_V_at)mv $@.tmp $@ - -makepkg.conf: $(srcdir)/makepkg.conf.in -pacman.conf: $(srcdir)/pacman.conf.in +%.conf: %.conf.in Makefile + $(SED_PROCESS) # vim:set ts=2 sw=2 noet: |