From 5ffb3413de890ccc73d6cb3cd98f6320100159e5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 17 May 2019 11:22:50 -0400 Subject: [PATCH] Move 'pre-inst-env.in' to 'build-aux'. * pre-inst-env.in: Move this... * build-aux/pre-inst-env.in: ...here. * configure.ac: Update reference. * .gitignore: Do not ignore it, and remove a duplicate 'pre-inst-env'. --- .gitignore | 2 +- pre-inst-env.in => build-aux/pre-inst-env.in | 0 configure.ac | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) rename pre-inst-env.in => build-aux/pre-inst-env.in (100%) diff --git a/.gitignore b/.gitignore index 64037cc..693b8de 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ /build-aux/* !/build-aux/git-version-gen !/build-aux/gitlab-ci.yml +!/build-aux/pre-inst-env.in /config.log /config.status /configure @@ -16,7 +17,6 @@ /gash/config.scm /lcov.info /pre-inst-env -/pre-inst-env /scripts/gash /tests/*.1 /tests/*.2 diff --git a/pre-inst-env.in b/build-aux/pre-inst-env.in similarity index 100% rename from pre-inst-env.in rename to build-aux/pre-inst-env.in diff --git a/configure.ac b/configure.ac index 3ed4809..fe36ab6 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,8 @@ AM_CONDITIONAL([HAVE_GENHTML], [test -n $GENHTML]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([gash/config.scm]) -AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env]) +AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in], + [chmod +x pre-inst-env]) AC_CONFIG_FILES([tests/unit/config.scm]) AC_CONFIG_FILES([tests/spec/Makefile]) AC_CONFIG_FILES([tools/coverage], [chmod +x tools/coverage])