summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2018-10-15 06:51:30 +0200
committerDavid Lamparter <equinox@diac24.net>2018-10-24 18:35:12 +0200
commit62e712146b01c0aabbdee34484ff44e955df7f19 (patch)
tree8c1d3d1a14a186d25ad9d59a82d007b0d66faf79
parentbuild: carry --with-pkg-extra-version into tarballs (diff)
downloadfrr-62e712146b01c0aabbdee34484ff44e955df7f19.tar.xz
frr-62e712146b01c0aabbdee34484ff44e955df7f19.zip
build: work around automake wtf
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>
-rw-r--r--doc/user/subdir.am14
1 files changed, 10 insertions, 4 deletions
diff --git a/doc/user/subdir.am b/doc/user/subdir.am
index 53d36052a..08b5dc954 100644
--- a/doc/user/subdir.am
+++ b/doc/user/subdir.am
@@ -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)