summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2019-04-04 23:43:51 (GMT)
committerAlexey Neyman <stilor@att.net>2019-04-05 01:57:42 (GMT)
commit8e24bb22d0f5f35c97af75bffbe3ebf052604c9e (patch)
tree6e7a57db00f981f0cf33ba20823184d1d8cd65ae
parentf9b57cc78a9ba496942743046a0d640a3daed026 (diff)
Do not include config/configure.in into the release tarball
Fixes #1176 Signed-off-by: Alexey Neyman <stilor@att.net>
-rw-r--r--Makefile.am5
-rwxr-xr-xbootstrap6
2 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index 6c224c1..37c3239 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,6 @@ SUBDIRS = kconfig
bin_SCRIPTS = ct-ng
CLEANFILES = ct-ng bash-completion/ct-ng docs/ct-ng.1
EXTRA_DIST = bootstrap ct-ng.in bash-completion/ct-ng.in \
- config/configure.in.in \
docs/ct-ng.1.in packages maintainer testing
if INSTALL_BASH_COMPLETION
@@ -18,9 +17,9 @@ endif
man1_MANS = docs/ct-ng.1
-# paths.sh generated by configure
+# paths.sh and configure.in are generated by configure
nobase_dist_pkgdata_DATA = $(verbatim_data)
-nobase_nodist_pkgdata_DATA = paths.sh
+nobase_nodist_pkgdata_DATA = paths.sh config/configure.in
# ct-ng, as renamed by the installation
ctng_progname = `echo ct-ng | sed '$(transform)'`
diff --git a/bootstrap b/bootstrap
index 787966e..6c3d6ae 100755
--- a/bootstrap
+++ b/bootstrap
@@ -801,10 +801,10 @@ msg "*** Gathering the list of data files to install"
scripts/compile | scripts/missing | scripts/depcomp | scripts/ltmain.sh | scripts/install-sh)
continue
;;
- # Special hack for configure.in.in - replace with the file that configure
+ #
# will produce. FIXME: create this file at the time of 'ct-ng build'.
- config/configure.in.in)
- f=config/configure.in
+ config/configure.in.in | config/configure.in)
+ continue
;;
esac
# Checks & substitutions above may result in duplicate files