From: David Lamparter Date: Mon, 15 Oct 2018 04:51:30 +0000 (+0200) Subject: build: work around automake wtf X-Git-Tag: frr-7.1-dev~235^2~2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=62e712146b01c0aabbdee34484ff44e955df7f19;p=matthieu%2Ffrr.git 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 --- diff --git a/doc/user/subdir.am b/doc/user/subdir.am index 53d36052ac..08b5dc954c 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)