bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scripts: fix some inaccurate Makefile targets, and be more templated

Browse source 
All of our scripts depend on the same pattern .sh.in, and since commit
b5d62d2c91, they also all (not just
makepkg itself) depend on libmakepkg.

There's no real reason to include separate targets for them just to
establish dependency rules.

While we are at it, fix a longstanding bug where generated wrapper
scripts did not depend on wrapper.sh.in (which due to moving to .lib,
requires we regenerate the script too), by making the shared target
pattern depend on it. All our generated scripts now require the wrapper,
even repo-add which now uses libmakepkg.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Eli Schwartz 2018-11-03 20:46:42 -04:00 • committed by Allan McRae
parent 83a16d3041
commit 71f837e45e
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scripts/Makefile.am
View file

@ -186,7 +186,7 @@ edit = sed \
## All the scripts depend on Makefile so that they are rebuilt when the ## All the scripts depend on Makefile so that they are rebuilt when the
## prefix etc. changes. Use chmod -w to prevent people from editing the ## prefix etc. changes. Use chmod -w to prevent people from editing the
## wrong file by accident. ## wrong file by accident.
$(OURSCRIPTS): Makefile $(OURSCRIPTS): %: %.sh.in wrapper.sh.in $(LIBMAKEPKG_IN) Makefile
$(AM_V_at)$(RM) $@ $(AM_V_at)$(RM) $@
$(AM_V_GEN)test -f $(srcdir)/$@.sh.in && m4 -P -I $(srcdir) $(srcdir)/$@.sh.in | $(edit) >$@ $(AM_V_GEN)test -f $(srcdir)/$@.sh.in && m4 -P -I $(srcdir) $(srcdir)/$@.sh.in | $(edit) >$@
$(AM_V_at)chmod +x,a-w $@ $(AM_V_at)chmod +x,a-w $@
@ -207,11 +207,6 @@ $(COMPLETION_IN): %: %.in Makefile
all-am: $(COMPLETION_IN) all-am: $(COMPLETION_IN)
makepkg: \
$(srcdir)/makepkg.sh.in \
$(srcdir)/wrapper.sh.in \
$(LIBMAKEPKG_IN)
makepkg-template: \ makepkg-template: \
$(srcdir)/makepkg-template.pl.in \ $(srcdir)/makepkg-template.pl.in \
Makefile Makefile
@ -220,20 +215,13 @@ makepkg-template: \
$(AM_V_GEN)$(edit) $< > $@ $(AM_V_GEN)$(edit) $< > $@
$(AM_V_at)chmod +x,a-w $@ $(AM_V_at)chmod +x,a-w $@
pacman-db-upgrade: $(srcdir)/pacman-db-upgrade.sh.in
pacman-key: $(srcdir)/pacman-key.sh.in
pkgdelta: $(srcdir)/pkgdelta.sh.in
repo-add: $(srcdir)/repo-add.sh.in
repo-remove repo-elephant: repo-add repo-remove repo-elephant: repo-add
$(AM_V_at)$(RM) $@ $(AM_V_at)$(RM) $@
$(AM_V_at)$(LN_S) repo-add $@ $(AM_V_at)$(LN_S) repo-add $@
.SECONDEXPANSION: .SECONDEXPANSION:
$(WRAPPER): \ $(WRAPPER): \
$(srcdir)/wrapper.sh.in \
$$(subst -wrapper,,$$@) $$(subst -wrapper,,$$@)
$(AM_V_at)$(MKDIR_P) .lib $(AM_V_at)$(MKDIR_P) .lib