summary refs log tree commit diff
diff options
context:
space:
mode:
authorMathieu Lirzin <mthl@gnu.org>2016-04-03 18:18:46 +0200
committerMathieu Lirzin <mthl@gnu.org>2016-04-15 00:59:07 +0200
commita1097caa6a30f45661ee510c59bf0e01972cebba (patch)
tree6ffe4997938608d555e5ecddbbdb267226e82246
parente66d1f59abc02d60be3328cb511452fec946bbb0 (diff)
downloadguix-a1097caa6a30f45661ee510c59bf0e01972cebba.tar.gz
build: Move environment '.in' scripts to 'build-aux' directory.
* pre-inst-env.in: Move to ...
* build-aux/pre-inst-env.in: ... here.
* test-env.in: Move to ...
* build-aux/test-env.in: ... here.
* configure.ac (AC_CONFIG_FILES): Adapt to this.  Keep the generated
scripts in their current location which is $(top_builddir).
-rw-r--r--build-aux/pre-inst-env.in (renamed from pre-inst-env.in)0
-rw-r--r--build-aux/test-env.in (renamed from test-env.in)0
-rw-r--r--configure.ac5
3 files changed, 3 insertions, 2 deletions
diff --git a/pre-inst-env.in b/build-aux/pre-inst-env.in
index fe56da6944..fe56da6944 100644
--- a/pre-inst-env.in
+++ b/build-aux/pre-inst-env.in
diff --git a/test-env.in b/build-aux/test-env.in
index c3f60f7283..c3f60f7283 100644
--- a/test-env.in
+++ b/build-aux/test-env.in
diff --git a/configure.ac b/configure.ac
index 6296b1f2ca..7c6fcc9ec9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,8 +211,9 @@ AC_CONFIG_FILES([Makefile
 		 guix/config.scm])
 
 AC_CONFIG_FILES([scripts/guix], [chmod +x scripts/guix])
-AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env])
-AC_CONFIG_FILES([test-env],     [chmod +x test-env])
+AC_CONFIG_FILES([test-env:build-aux/test-env.in], [chmod +x test-env])
+AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in],
+  [chmod +x pre-inst-env])
 
 dnl Emacs interface.
 AC_PATH_PROG([DOT_USER_PROGRAM], [dot], [dot])