From 116f061dfeed989b5d25299c1acdc609679428d9 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Sun, 11 Apr 2021 06:12:32 +0000
Subject: project: posix make support: refactored source generation rules.

---
 project/srcgen.mk | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'project')

diff --git a/project/srcgen.mk b/project/srcgen.mk
index 3f73ec5..dd489ff 100644
--- a/project/srcgen.mk
+++ b/project/srcgen.mk
@@ -31,7 +31,6 @@ BIN_SUBST_RULES         = \
 			-e 's!@datadir@!$(DATADIR)!g'
 
 SRCINFO_SUBST_RULES     = \
-			-e 's!@program@!$(PROGRAM)!g'                     \
 			-e 's!@srcsite@!$(SRCSITE)!g'                     \
 			-e 's!@package@!$(PACKAGE)!g'                     \
 			-e 's,@pgprkey@,$(PGPRKEY),g'                     \
@@ -52,34 +51,34 @@ MAN_GEN_SRCS            = man/aclocal.1  man/aclocal-$(AUTOMAKE_VER).1 \
 ALL_GEN_SRCS            = $(M4_GEN_SRCS) $(BIN_GEN_SRCS) $(LIB_GEN_SRCS) $(MAN_GEN_SRCS)
 
 m4/amversion.m4: $(SOURCE_DIR)/m4/amversion.in tree.tag
-	sed $(M4_SUBST_RULES) $< > $@
+	sed $(M4_SUBST_RULES) $(SOURCE_DIR)/m4/amversion.in > $@
 
-bin/aclocal-$(AUTOMAKE_VER): PROGRAM=aclocal
 bin/aclocal-$(AUTOMAKE_VER): $(SOURCE_DIR)/bin/aclocal.in tree.tag
 	sed -e '/$$PACKAGE) $$VERSION/,$$d' $(BIN_SUBST_RULES) \
-		$< > $@.tmp                                     \
-	&& sed $(SRCINFO_SUBST_RULES)                            \
-		$(SRCINFO) >> $@.tmp                              \
-	&& sed -e '/$$PACKAGE) $$VERSION/p'                        \
-		-e '1,/$$PACKAGE) $$VERSION/d' $(BIN_SUBST_RULES)   \
-		$< >> $@.tmp                                         \
-	&& chmod +x $@.tmp                                            \
+		$(SOURCE_DIR)/bin/aclocal.in > $@.tmp           \
+	&& sed -e 's!@program@!aclocal!g'                        \
+		$(SRCINFO_SUBST_RULES)                            \
+		$(SRCINFO) >> $@.tmp                               \
+	&& sed -e '/$$PACKAGE) $$VERSION/p'                         \
+		-e '1,/$$PACKAGE) $$VERSION/d' $(BIN_SUBST_RULES)    \
+		$(SOURCE_DIR)/bin/aclocal.in >> $@.tmp                \
+	&& chmod +x $@.tmp                                             \
 	&& mv $@.tmp $@
 
-bin/automake-$(AUTOMAKE_VER): PROGRAM=automake
 bin/automake-$(AUTOMAKE_VER): $(SOURCE_DIR)/bin/automake.in tree.tag
 	sed -e '/$$PACKAGE) $$VERSION/,$$d' $(BIN_SUBST_RULES) \
-		$< > $@.tmp                                     \
-	&& sed $(SRCINFO_SUBST_RULES)                            \
-		$(SRCINFO) >> $@.tmp                              \
-	&& sed -e '/$$PACKAGE) $$VERSION/p'                        \
-		-e '1,/$$PACKAGE) $$VERSION/d' $(BIN_SUBST_RULES)   \
-		$< >> $@.tmp                                         \
-	&& chmod +x $@.tmp                                            \
+		$(SOURCE_DIR)/bin/automake.in > $@.tmp          \
+	&& sed -e 's!@program@!automake!g'                       \
+		$(SRCINFO_SUBST_RULES)                            \
+		$(SRCINFO) >> $@.tmp                               \
+	&& sed -e '/$$PACKAGE) $$VERSION/p'                         \
+		-e '1,/$$PACKAGE) $$VERSION/d' $(BIN_SUBST_RULES)    \
+		$(SOURCE_DIR)/bin/automake.in >> $@.tmp               \
+	&& chmod +x $@.tmp                                             \
 	&& mv $@.tmp $@
 
 lib/Automake/Config.pm: $(SOURCE_DIR)/lib/Automake/Config.in tree.tag
-	sed $(LIB_SUBST_RULES) $< > $@
+	sed $(LIB_SUBST_RULES) $(SOURCE_DIR)/lib/Automake/Config.in > $@
 
 man/aclocal.1: tree.tag
 	printf '.so man1/aclocal-%s.1\n' $(AUTOMAKE_VER) > $@
-- 
cgit v1.2.3