Substitute src/args-std.def via configure runtmp-substitution

Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>

4 files changed, 12 insertions, 14 deletions

diff --git a/Makefile.am b/Makefile.am
index f4f7e3b43f..0e51dcec6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -168,9 +168,6 @@ dist-hook: libopts-check symbol-check
 	$(MAKE) -C doc/manpages compare-makefile
 	$(MAKE) ChangeLog
 	mv ChangeLog $(distdir)
-	$(SED) 's/\@VERSION\@/$(VERSION)/g' -i $(distdir)/src/args-std.def
-	$(SED) 's/\@YEAR\@/$(YEAR)/g' -i $(distdir)/src/args-std.def
-	$(SED) 's/\@PACKAGE_BUGREPORT\@/$(PACKAGE_BUGREPORT)/g' -i $(distdir)/src/args-std.def
 	cd $(distdir)/src/ && for i in *.def;do \
 		if test x"$$i" = x"args-std.def";then  continue; fi; \
 		autogen $$i; \
diff --git a/configure.ac b/configure.ac
index 3001d212e1..70f517b0fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -986,6 +986,7 @@ AC_CONFIG_FILES([
   po/Makefile.in
   src/Makefile
   src/gl/Makefile
+  src/args-std.def
   tests/Makefile
   tests/windows/Makefile
   tests/cert-tests/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 75fef1d556..2580302e96 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -231,67 +231,67 @@ libcmd_systemkey_la_LIBADD += $(LTLIBREADLINE) $(INET_PTON_LIB) $(LIB_CLOCK_GETT
 
 danetool-args.h: danetool-args.stamp
 danetool-args.c: danetool-args.stamp
-danetool-args.stamp: $(srcdir)/danetool-args.def $(srcdir)/args-std.def
+danetool-args.stamp: $(srcdir)/danetool-args.def args-std.def
 	-$(AUTOGEN) $<
 	touch $@
 
 ocsptool-args.h: ocsptool-args.stamp
 ocsptool-args.c: ocsptool-args.stamp
-ocsptool-args.stamp: $(srcdir)/ocsptool-args.def $(srcdir)/args-std.def
+ocsptool-args.stamp: $(srcdir)/ocsptool-args.def args-std.def
 	-$(AUTOGEN) $<
 	touch $@
 
 tpmtool-args.h: tpmtool-args.stamp
 tpmtool-args.c: tpmtool-args.stamp
-tpmtool-args.stamp: $(srcdir)/tpmtool-args.def $(srcdir)/args-std.def
+tpmtool-args.stamp: $(srcdir)/tpmtool-args.def args-std.def
 	-$(AUTOGEN) $<
 	touch $@
 
 p11tool-args.h: p11tool-args.stamp
 p11tool-args.c: p11tool-args.stamp
-p11tool-args.stamp: $(srcdir)/p11tool-args.def $(srcdir)/args-std.def
+p11tool-args.stamp: $(srcdir)/p11tool-args.def args-std.def
 	-$(AUTOGEN) $<
 	touch $@
 
 psktool-args.h: psktool-args.stamp
 psktool-args.c: psktool-args.stamp
-psktool-args.stamp: $(srcdir)/psktool-args.def $(srcdir)/args-std.def
+psktool-args.stamp: $(srcdir)/psktool-args.def args-std.def
 	-$(AUTOGEN) $<
 	touch $@
 
 cli-debug-args.h: cli-debug-args.stamp
 cli-debug-args.c: cli-debug-args.stamp
-cli-debug-args.stamp: $(srcdir)/cli-debug-args.def $(srcdir)/args-std.def
+cli-debug-args.stamp: $(srcdir)/cli-debug-args.def args-std.def
 	-$(AUTOGEN) $<
 	touch $@
 
 cli-args.h: cli-args.stamp
 cli-args.c: cli-args.stamp
-cli-args.stamp: $(srcdir)/cli-args.def $(srcdir)/args-std.def
+cli-args.stamp: $(srcdir)/cli-args.def args-std.def
 	-$(AUTOGEN) $<
 	touch $@
 
 serv-args.h: serv-args.stamp
 serv-args.c: serv-args.stamp
-serv-args.stamp: $(srcdir)/serv-args.def $(srcdir)/args-std.def
+serv-args.stamp: $(srcdir)/serv-args.def args-std.def
 	-$(AUTOGEN) $<
 	touch $@
 
 srptool-args.h: srptool-args.stamp
 srptool-args.c: srptool-args.stamp
-srptool-args.stamp: $(srcdir)/srptool-args.def $(srcdir)/args-std.def
+srptool-args.stamp: $(srcdir)/srptool-args.def args-std.def
 	-$(AUTOGEN) $<
 	touch $@
 
 certtool-args.h: certtool-args.stamp
 certtool-args.c: certtool-args.stamp
-certtool-args.stamp: $(srcdir)/certtool-args.def $(srcdir)/args-std.def
+certtool-args.stamp: $(srcdir)/certtool-args.def args-std.def
 	-$(AUTOGEN) $<
 	touch $@
 
 systemkey-args.h: systemkey-args.stamp
 systemkey-args.c: systemkey-args.stamp
-systemkey-args.stamp: $(srcdir)/systemkey-args.def $(srcdir)/args-std.def
+systemkey-args.stamp: $(srcdir)/systemkey-args.def args-std.def
 	-$(AUTOGEN) $<
 	touch $@
 
diff --git a/src/args-std.def b/src/args-std.def.in
index 93634a1857..93634a1857 100644
--- a/src/args-std.def
+++ b/src/args-std.def.in