From 225bac5a49374ef996d6f1072049776d79d3a5dd Mon Sep 17 00:00:00 2001 From: Levente Polyak Date: Wed, 18 May 2022 00:45:00 +0200 Subject: [PATCH] make: properly handle build target prerequisites - Use wildcard for the lib directory for all binprogs - Fix individual man page prerequisites for asciidoc.conf and footer - Require all as prerequisite for the install target --- Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 3e55e8b..b7dcfd1 100644 --- a/Makefile +++ b/Makefile @@ -108,7 +108,7 @@ man: $(MANS) edit = sed -e "s|@pkgdatadir[@]|$(PREFIX)/share/devtools|g" -$(BUILDDIR)/bin/% $(BUILDDIR)/completion/%: %.in Makefile lib/common.sh +$(BUILDDIR)/bin/% $(BUILDDIR)/completion/%: %.in Makefile $(wildcard lib/*.sh) @echo "GEN $(notdir $@)" @mkdir -p $(dir $@) @$(RM) "$@" @@ -117,16 +117,14 @@ $(BUILDDIR)/bin/% $(BUILDDIR)/completion/%: %.in Makefile lib/common.sh @chmod +x "$@" @bash -O extglob -n "$@" -$(MANS): doc/asciidoc.conf doc/footer.asciidoc - -$(BUILDDIR)/doc/%: doc/%.asciidoc +$(BUILDDIR)/doc/%: doc/%.asciidoc doc/asciidoc.conf doc/footer.asciidoc @mkdir -p $(BUILDDIR)/doc a2x --no-xmllint --asciidoc-opts="-f doc/asciidoc.conf" -d manpage -f manpage --destination-dir=$(BUILDDIR)/doc -a pkgdatadir=$(PREFIX)/share/devtools $< clean: rm -rf $(BUILDDIR) -install: +install: all install -dm0755 $(DESTDIR)$(PREFIX)/bin install -dm0755 $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d install -m0755 ${BINPROGS} $(DESTDIR)$(PREFIX)/bin