]> git.puffer.fish Git - matthieu/frr.git/commitdiff
build: work around automake wtf
authorDavid Lamparter <equinox@diac24.net>
Mon, 15 Oct 2018 04:51:30 +0000 (06:51 +0200)
committerDavid Lamparter <equinox@diac24.net>
Wed, 24 Oct 2018 16:35:12 +0000 (18:35 +0200)
For some reason, automake was "randomizing" the order of these few lines
in the generated output Makefile.in.

I have absolutely no clue what's going on, but it's the only thing
preventing me from building reproducible source tarballs (i.e.
bit-exactly identical), so... just slightly "rephrase" this.

Should behave exactly the same as before.

Signed-off-by: David Lamparter <equinox@diac24.net>
doc/user/subdir.am

index 53d36052ac8d2e5dada1b87367ac3e7b78237ca5..08b5dc954c5f08953df5404a98d097227a4dba35 100644 (file)
@@ -100,12 +100,18 @@ uninstall-html:
 .PHONY: install-data-local uninstall-local
 if DOC
 DOC_INFO=info
-install-data-local: install-info
-uninstall-local:  uninstall-info
+TARGET_INSTALL_INFO=install-info
+TARGET_UNINSTALL_INFO=uninstall-info
 endif
 if DOC_HTML
 DOC_HTML=html
-install-data-local: install-html
-uninstall-local:  uninstall-html
+TARGET_INSTALL_HTML=install-html
+TARGET_UNINSTALL_HTML=uninstall-html
 endif
+
+# leave the comments in, this was causing weird reordering issues in automake
+install-data-local: $(TARGET_INSTALL_INFO) $(TARGET_INSTALL_HTML)
+#
+uninstall-local: $(TARGET_UNINSTALL_INFO) $(TARGET_UNINSTALL_HTML)
+#
 doc: $(DOC_INFO) $(DOC_HTML)