1
0
mirror of https://git.savannah.gnu.org/git/gperf.git synced 2025-12-02 13:09:22 +00:00

Distribute install-sh.

This commit is contained in:
Bruno Haible
2012-07-01 16:29:28 +02:00
parent 9702bc0bff
commit 73f48ca14d
5 changed files with 12 additions and 7 deletions

1
.gitignore vendored
View File

@@ -6,6 +6,7 @@
\#*# \#*#
# Files brought in by gnulib-tool: # Files brought in by gnulib-tool:
install-sh
mkinstalldirs mkinstalldirs
# Files generated by the autotools: # Files generated by the autotools:

View File

@@ -1,3 +1,11 @@
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> 2012-07-01 Bruno Haible <bruno@clisp.org>
Remove files distributed via gnulib from version control. Remove files distributed via gnulib from version control.

View File

@@ -64,7 +64,7 @@ SOURCE_FILES = \
configure.ac aclocal.m4 Makefile.in Makefile.msvc Makefile.vms \ configure.ac aclocal.m4 Makefile.in Makefile.msvc Makefile.vms \
Makefile.devel ChangeLog Makefile.devel ChangeLog
# List of distributed files imported from other packages. # 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. # List of distributed files generated by autotools or Makefile.devel.
GENERATED_FILES = configure GENERATED_FILES = configure
# List of distributed files generated by "make". # List of distributed files generated by "make".

View File

@@ -29,7 +29,7 @@
GNULIB_REPO_URL="http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f=" 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 if test -n "$GNULIB_TOOL"; then
$GNULIB_TOOL--copy-file build-aux/$file $file $GNULIB_TOOL--copy-file build-aux/$file $file
else else
@@ -37,7 +37,7 @@ for file in mkinstalldirs; do
&& mv $file.tmp $file && mv $file.tmp $file
fi fi
done done
chmod a+x mkinstalldirs chmod a+x install-sh mkinstalldirs
rm -f configure lib/configure src/configure tests/configure doc/configure 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 rm -f src/config.h.in src/config.h.msvc src/config.h_vms

View File

@@ -25,10 +25,6 @@ AC_PROG_MAKE_SET
AC_OBJEXT AC_OBJEXT
AC_EXEEXT 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]) AC_CONFIG_SUBDIRS([lib src tests doc])
dnl This piece of sed script replaces every line containing '@subdir@' dnl This piece of sed script replaces every line containing '@subdir@'