From 6005bd0700544df27331c6aad9c7642dce9a91c8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 9 Dec 2014 11:44:21 +0100 Subject: [PATCH] build: Make sure the installed 'config.go' is newer than 'config.scm'. Fixes . Reported by rekado . * gnu-system.am (install-data-hook): Rename to... (set-bootstrap-executable-permissions): ... this. * Makefile.am (install-data-hook): New target. --- Makefile.am | 7 +++++++ gnu-system.am | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 25ff2224cc..bc0b95232e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -282,6 +282,13 @@ SUFFIXES = .go guix_install_go_files = install-nobase_nodist_guilemoduleDATA $(guix_install_go_files): install-nobase_dist_guilemoduleDATA +# The above trick doesn't work for 'config.go' because both 'config.scm' and +# 'config.go' are listed in $(nobase_nodist_guilemodule_DATA). Thus, give it +# special treatment. +install-data-hook: set-bootstrap-executable-permissions + touch "$(DESTDIR)$(guilemoduledir)/guix/config.go" + + SUBDIRS = po/guix po/packages BUILT_SOURCES = diff --git a/gnu-system.am b/gnu-system.am index e21771c669..ab62510159 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -484,7 +484,7 @@ nodist_bootstrap_mips64el_linux_DATA = \ # Those files must remain executable, so they remain executable once # imported into the store. -install-data-hook: +set-bootstrap-executable-permissions: chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz} DISTCLEANFILES = \ -- 2.20.1