From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 31 Jan 2012 00:22:09 +0000 (+0100)
Subject: replacing the version is not enough. Regenerate all files depending on .dep on dist... 
X-Git-Tag: gnutls_3_0_13~130
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4dbfdd7287f098aa274ebd4f6e256f51679ced08;p=thirdparty%2Fgnutls.git

replacing the version is not enough. Regenerate all files depending on .dep on dist-hook.
---

diff --git a/Makefile.am b/Makefile.am
index ed8cc04cf3..4fdae7178e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,3 +42,13 @@ dist-hook:
 	make ChangeLog
 	cp -f ChangeLog $(distdir)/
 	sed 's/\@VERSION\@/$(VERSION)/g' -i $(distdir)/src/*.def
+	cd $(distdir)/src/ && for i in *.def;do \
+		autogen $$i; \
+		autogen -Tagtexi-cmd.tpl $$i; \
+		cp $$i $$i.tmp; \
+		sed -i 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $$i.tmp; \
+		autogen -Tagman-cmd.tpl $$i.tmp; \
+		rm -f $$i.tmp; \
+		mv -f *.1 ../doc/manpages/; \
+		mv -f *.texi ../doc/manpages; \
+	done
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 392da65e17..f62cb1e381 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -29,41 +29,41 @@ SUBDIRS += reference
 endif
 
 invoke-gnutls-cli.texi: ../src/cli-args.def
-	cd ../src/ && autogen -Tagtexi-cmd.tpl $<
+	-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
 	mv ../src/$@ .
 
 invoke-gnutls-cli-debug.texi: ../src/cli-debug-args.def
-	cd ../src/ && autogen -Tagtexi-cmd.tpl $<
+	-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
 	mv ../src/$@ .
 
 invoke-gnutls-serv.texi: ../src/serv-args.def
-	cd ../src/ && autogen -Tagtexi-cmd.tpl $<
+	-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
 	mv ../src/$@ .
 
 invoke-certtool.texi: ../src/certtool-args.def
-	cd ../src/ && autogen -Tagtexi-cmd.tpl $<
+	-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
 	mv ../src/$@ .
 
 invoke-srptool.texi: ../src/srptool-args.def
-	cd ../src/ && autogen -Tagtexi-cmd.tpl $<
-	mv ../src/$@ .
-	sed -i 's/@subsection/@subsubsection/g' $@
+	-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
+	mv ../src/$@ . && \
+	sed -i 's/@subsection/@subsubsection/g' $@ && \
 	sed -i 's/@section/@subsection/g' $@
 
 invoke-ocsptool.texi: ../src/ocsptool-args.def
-	cd ../src/ && autogen -Tagtexi-cmd.tpl $<
+	-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
 	mv ../src/$@ .
 
 invoke-psktool.texi: ../src/psk-args.def
-	cd ../src/ && autogen -Tagtexi-cmd.tpl $<
-	mv ../src/$@ .
-	sed -i 's/@subsection/@subsubsection/g' $@
+	-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
+	mv ../src/$@ . && \
+	sed -i 's/@subsection/@subsubsection/g' $@ && \
 	sed -i 's/@section/@subsection/g' $@
 
 invoke-p11tool.texi: ../src/p11tool-args.def
-	cd ../src/ && autogen -Tagtexi-cmd.tpl $<
-	mv ../src/$@ .
-	sed -i 's/@subsection/@subsubsection/g' $@
+	-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
+	mv ../src/$@ . && \
+	sed -i 's/@subsection/@subsubsection/g' $@ && \
 	sed -i 's/@section/@subsection/g' $@
 
 info_TEXINFOS = gnutls.texi gnutls-guile.texi
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index b13af2ab14..4a344c7215 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -33,43 +33,43 @@ endif
 # is out, replace the sed and tmp files with a simple
 # autogen -DMAN_SECTION=1 -Tagman-cmd.tpl $<
 certtool.1: ../../src/certtool-args.def
-	sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp
-	autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp
+	-sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \
+	autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \
 	rm -f "$<".tmp
 
 ocsptool.1: ../../src/ocsptool-args.def
-	sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp
-	autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp
+	-sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \
+	autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \
 	rm -f "$<".tmp
 
 gnutls-cli.1: ../../src/cli-args.def
-	sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp
-	autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp
+	-sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \
+	autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \
 	rm -f "$<".tmp
 
 gnutls-serv.1: ../../src/serv-args.def
-	sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp
-	autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp
+	-sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \
+	autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \
 	rm -f "$<".tmp
 
 gnutls-cli-debug.1: ../../src/cli-debug-args.def
-	sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp
-	autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp
+	-sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \
+	autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \
 	rm -f "$<".tmp
 
 srptool.1: ../../src/srptool-args.def
-	sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp
-	autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp
+	-sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \
+	autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \
 	rm -f "$<".tmp
 
 p11tool.1: ../../src/p11tool-args.def
-	sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp
-	autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp
+	-sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \
+	autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \
 	rm -f "$<".tmp
 
 psktool.1: ../../src/psk-args.def
-	sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp
-	autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp
+	-sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \
+	autogen -DMAN_SECTION=1 -Tagman-cmd.tpl "$<".tmp && \
 	rm -f "$<".tmp
 
 APIMANS =