[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/04: build: Make sure the installed 'config.go' is newer than 'config.
From: |
Ludovic Courtès |
Subject: |
04/04: build: Make sure the installed 'config.go' is newer than 'config.scm'. |
Date: |
Tue, 09 Dec 2014 10:46:07 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 6005bd0700544df27331c6aad9c7642dce9a91c8
Author: Ludovic Courtès <address@hidden>
Date: Tue Dec 9 11:44:21 2014 +0100
build: Make sure the installed 'config.go' is newer than 'config.scm'.
Fixes <http://bugs.gnu.org/19317>.
Reported by rekado <address@hidden>.
* 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 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 25ff222..bc0b952 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 e21771c..ab62510 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 = \