diff options
author | Bruno Haible <bruno@clisp.org> | 2012-07-01 16:29:28 +0200 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2012-07-01 16:29:28 +0200 |
commit | 73f48ca14d80febf4b1c5433614132b4b1b8c4ca (patch) | |
tree | ee4449faba9324bafda21280c1acbd5888e27f91 | |
parent | 9702bc0bffac4b0719f3b075207f4bfef9ef08bb (diff) | |
download | gperf-73f48ca14d80febf4b1c5433614132b4b1b8c4ca.tar.gz |
Distribute install-sh.
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | Makefile.in | 2 | ||||
-rwxr-xr-x | autogen.sh | 4 | ||||
-rw-r--r-- | configure.ac | 4 |
5 files changed, 12 insertions, 7 deletions
@@ -6,6 +6,7 @@ \#*# # Files brought in by gnulib-tool: +install-sh mkinstalldirs # Files generated by the autotools: @@ -1,5 +1,13 @@ 2012-07-01 Bruno Haible <bruno@clisp.org> + Distribute install-sh. + * autogen.sh: Fetch also install-sh. + * Makefile.in (IMPORTED_FILES): Add install-sh. + * configure.ac: Remove hack with AC_CONFIG_AUX_DIR_DEFAULT. + * .gitignore: Add install-sh. + +2012-07-01 Bruno Haible <bruno@clisp.org> + Remove files distributed via gnulib from version control. * autogen.sh: Fetch mkinstalldirs from the gnulib repository. * mkinstalldirs: Remove file. diff --git a/Makefile.in b/Makefile.in index 12c8da6..b91c78d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -64,7 +64,7 @@ SOURCE_FILES = \ configure.ac aclocal.m4 Makefile.in Makefile.msvc Makefile.vms \ Makefile.devel ChangeLog # List of distributed files imported from other packages. -IMPORTED_FILES = COPYING INSTALL mkinstalldirs +IMPORTED_FILES = COPYING INSTALL install-sh mkinstalldirs # List of distributed files generated by autotools or Makefile.devel. GENERATED_FILES = configure # List of distributed files generated by "make". @@ -29,7 +29,7 @@ GNULIB_REPO_URL="http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f=" -for file in mkinstalldirs; do +for file in install-sh mkinstalldirs; do if test -n "$GNULIB_TOOL"; then $GNULIB_TOOL--copy-file build-aux/$file $file else @@ -37,7 +37,7 @@ for file in mkinstalldirs; do && mv $file.tmp $file fi done -chmod a+x mkinstalldirs +chmod a+x install-sh mkinstalldirs rm -f configure lib/configure src/configure tests/configure doc/configure rm -f src/config.h.in src/config.h.msvc src/config.h_vms diff --git a/configure.ac b/configure.ac index 2c19e89..c60db0a 100644 --- a/configure.ac +++ b/configure.ac @@ -25,10 +25,6 @@ AC_PROG_MAKE_SET AC_OBJEXT AC_EXEEXT -dnl An autoconf-2.52 bug: AC_CONFIG_SUBDIRS requires AC_CONFIG_AUX_DIR_DEFAULT, -dnl if the package does not ship with install-sh, install.sh, or shtool. -ac_aux_dir=$srcdir -AC_PROVIDE([AC_CONFIG_AUX_DIR_DEFAULT]) AC_CONFIG_SUBDIRS([lib src tests doc]) dnl This piece of sed script replaces every line containing '@subdir@' |