mirror of
https://git.savannah.gnu.org/git/gperf.git
synced 2025-12-02 13:09:22 +00:00
Move build infrastructure files to build-aux/.
This commit is contained in:
4
.gitignore
vendored
4
.gitignore
vendored
@@ -5,10 +5,6 @@
|
||||
.#*
|
||||
\#*#
|
||||
|
||||
# Files brought in by gnulib-tool:
|
||||
install-sh
|
||||
mkinstalldirs
|
||||
|
||||
# Files generated by the autotools:
|
||||
/configure
|
||||
|
||||
|
||||
12
ChangeLog
12
ChangeLog
@@ -1,3 +1,15 @@
|
||||
2012-07-01 Bruno Haible <bruno@clisp.org>
|
||||
|
||||
Move build infrastructure files to build-aux/.
|
||||
* autogen.sh: Copy install-sh and mkinstalldirst into build-aux/.
|
||||
* configure.ac: Invoke AC_CONFIG_AUX_DIR.
|
||||
* Makefile.in (IMPORTED_FILES): Update.
|
||||
(distdir): Create subdirectories as needed.
|
||||
* doc/Makefile.in (MKINSTALLDIRS): Update.
|
||||
* src/Makefile.in (MKINSTALLDIRS): Update.
|
||||
* .gitgnore: Remove install-sh, mkinstalldirs.
|
||||
* build-aux/.gitignore: New file.
|
||||
|
||||
2012-07-01 Bruno Haible <bruno@clisp.org>
|
||||
|
||||
Distribute install-sh.
|
||||
|
||||
@@ -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 install-sh mkinstalldirs
|
||||
IMPORTED_FILES = COPYING INSTALL build-aux/install-sh build-aux/mkinstalldirs
|
||||
# List of distributed files generated by autotools or Makefile.devel.
|
||||
GENERATED_FILES = configure
|
||||
# List of distributed files generated by "make".
|
||||
@@ -75,6 +75,8 @@ DISTFILES = $(SOURCE_FILES) $(IMPORTED_FILES) $(GENERATED_FILES) $(DISTRIBUTED_B
|
||||
distdir : $(DISTFILES)
|
||||
for file in $(DISTFILES); do \
|
||||
if test -f $$file; then dir='.'; else dir='$(srcdir)'; fi; \
|
||||
destdir=`echo '$(distdir)'/$$file | sed -e 's|//*[^/]*$$||'`; \
|
||||
test -d "$$destdir" || mkdir "$$destdir"; \
|
||||
cp -p $$dir/$$file '$(distdir)'/$$file || exit 1; \
|
||||
done
|
||||
subdir=@subdir@; test -d '$(distdir)'/$$subdir || mkdir '$(distdir)'/$$subdir; cd $$subdir; $(MAKE) distdir distdir='$(distdir)'/$$subdir
|
||||
|
||||
@@ -29,15 +29,15 @@
|
||||
|
||||
GNULIB_REPO_URL="http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f="
|
||||
|
||||
for file in install-sh mkinstalldirs; do
|
||||
for file in build-aux/install-sh build-aux/mkinstalldirs; do
|
||||
if test -n "$GNULIB_TOOL"; then
|
||||
$GNULIB_TOOL--copy-file build-aux/$file $file
|
||||
$GNULIB_TOOL--copy-file $file $file
|
||||
else
|
||||
wget -q --timeout=5 -O $file.tmp "${GNULIB_REPO_URL}build-aux/$file" \
|
||||
wget -q --timeout=5 -O $file.tmp "${GNULIB_REPO_URL}$file" \
|
||||
&& mv $file.tmp $file
|
||||
fi
|
||||
done
|
||||
chmod a+x install-sh mkinstalldirs
|
||||
chmod a+x build-aux/install-sh build-aux/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
|
||||
|
||||
4
build-aux/.gitignore
vendored
Normal file
4
build-aux/.gitignore
vendored
Normal file
@@ -0,0 +1,4 @@
|
||||
# Files brought in by gnulib-tool:
|
||||
install-sh
|
||||
mkinstalldirs
|
||||
|
||||
@@ -21,6 +21,8 @@ dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
AC_PREREQ([2.60])
|
||||
AC_INIT([doc/gperf.texi])
|
||||
AC_CONFIG_AUX_DIR([build-aux])
|
||||
|
||||
AC_PROG_MAKE_SET
|
||||
AC_OBJEXT
|
||||
AC_EXEEXT
|
||||
|
||||
@@ -55,7 +55,7 @@ TEXI2HTML = perl $(srcdir)/texi2html
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
MKINSTALLDIRS = $(SHELL) $(srcdir)/../mkinstalldirs
|
||||
MKINSTALLDIRS = $(SHELL) $(srcdir)/../build-aux/mkinstalldirs
|
||||
|
||||
#### End of system configuration section. ####
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ RM = rm -f
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
MKINSTALLDIRS = $(SHELL) $(srcdir)/../mkinstalldirs
|
||||
MKINSTALLDIRS = $(SHELL) $(srcdir)/../build-aux/mkinstalldirs
|
||||
|
||||
#### End of system configuration section. ####
|
||||
|
||||
|
||||
Reference in New Issue
Block a user