Merge pull request #1101 from stilor/install-fixes

Install fixes

4 files changed, 13 insertions, 11 deletions

diff --git a/Makefile.am b/Makefile.am
index 92ee910..6c224c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,8 @@ 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 \
-				  docs/ct-ng.1.in packages maintainer
+				  config/configure.in.in \
+				  docs/ct-ng.1.in packages maintainer testing
 
 if INSTALL_BASH_COMPLETION
 compdir				= @BASH_COMPLETION_DIR@
@@ -18,7 +19,8 @@ endif
 man1_MANS	= docs/ct-ng.1
 
 # paths.sh generated by configure
-nobase_dist_pkgdata_DATA = $(verbatim_data) paths.sh
+nobase_dist_pkgdata_DATA = $(verbatim_data)
+nobase_nodist_pkgdata_DATA = paths.sh
 
 # ct-ng, as renamed by the installation
 ctng_progname		= `echo ct-ng | sed '$(transform)'`
@@ -76,12 +78,16 @@ endif
 uninstall-hook:
 	rm -f $(DESTDIR)$(man1dir)/$(ctng_progname).1.gz
 
-dist-hook: fetch-docs gen-tarball-version
+dist-hook: fetch-docs create-symlinks gen-tarball-version
 
 .PHONY: fetch-docs
 fetch-docs: maintainer/download-docs.sh
 	$< $(top_distdir) $(USER_MANUAL_FILES)
 
+.PHONY: create-symlinks
+create-symlinks:
+	ln -s COPYING $(top_distdir)/LICENSE
+
 .PHONY: gen-tarball-version
 gen-tarball-version:
 	echo $(VERSION) > $(distdir)/.tarball-version
diff --git a/bootstrap b/bootstrap
index 2d398e1..c55c3e2 100755
--- a/bootstrap
+++ b/bootstrap
@@ -745,12 +745,7 @@ msg "*** Gathering the list of data files to install"
     find COPYING config contrib licenses.d packages samples scripts -type f | LANG=C sort | while read f; do
         # Implement some kind of .installignore for these files?
         case "${f}" in
-            # Skip certain files not needed at runtime (used above for generating kconfig
-            # fragments).
-            packages/*.help | packages/*.desc)
-                continue
-                ;;
-            # And, some file automake insists we must have
+            # And, some files automake insists we must have
             scripts/compile | scripts/missing | scripts/depcomp | scripts/ltmain.sh | scripts/install-sh)
                 continue
                 ;;
diff --git a/maintainer/create-release.sh b/maintainer/create-release.sh
index ae6e8ec..7daec6a 100755
--- a/maintainer/create-release.sh
+++ b/maintainer/create-release.sh
@@ -8,6 +8,7 @@ if [ -z "${topdir}" ]; then
     do_abort "Not in the Git clone"
 fi
 cd "${topdir}"
+git clean -fxdq
 ./bootstrap
 ./configure --enable-local
 make dist-create-release
diff --git a/maintainer/git-version-gen b/maintainer/git-version-gen
index 6d073fc..4a6d331 100755
--- a/maintainer/git-version-gen
+++ b/maintainer/git-version-gen
@@ -155,8 +155,8 @@ then
 # directory, and "git describe" output looks sensible, use that to
 # derive a version string.
 elif test "`git log -1 --pretty=format:x . 2>&1`" = x \
-    && v=`git describe --abbrev=4 --match="$prefix*" HEAD 2>/dev/null \
-          || git describe --abbrev=4 HEAD 2>/dev/null` \
+    && v=`git describe --abbrev=7 --match="$prefix*" HEAD 2>/dev/null \
+          || git describe --abbrev=7 HEAD 2>/dev/null` \
     && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \
     && case $v in
          $prefix[0-9]*) ;;