From 8e24bb22d0f5f35c97af75bffbe3ebf052604c9e Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Thu, 4 Apr 2019 16:43:51 -0700 Subject: Do not include config/configure.in into the release tarball Fixes #1176 Signed-off-by: Alexey Neyman 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 -- cgit v0.10.2-6-g49f6