Skip to content

Commit 1a1fb4b

Browse files
committed
Always use the newest copies of config.guess, config.sub.
1 parent 6075e23 commit 1a1fb4b

File tree

5 files changed

+19
-3241
lines changed

5 files changed

+19
-3241
lines changed

ChangeLog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2016-12-04 Bruno Haible <bruno@clisp.org>
2+
3+
Always use the newest copies of config.guess, config.sub.
4+
* Makefile.devel (gnulib-imported-files): New target.
5+
* autogen.sh: Invoke it.
6+
* build-aux/config.guess: Remove from version control.
7+
* build-aux/config.sub: Likewise.
8+
19
2016-12-04 Bruno Haible <bruno@clisp.org>
210

311
Always use the newest copy of fcntl-o.m4.

Makefile.devel

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,14 @@ srclib/Makefile.in : srclib/Makefile.am srclib/Makefile.gnulib
9393
fi
9494
$(AUTOMAKE) --gnits --add-missing srclib/Makefile
9595

96+
gnulib-imported-files : force
97+
if test -n "$$GNULIB_TOOL"; then \
98+
for file in config.guess config.sub; do \
99+
$$GNULIB_TOOL --copy-file build-aux/$$file || exit $$?; \
100+
chmod a+x build-aux/$$file || exit $$?; \
101+
done; \
102+
fi
103+
96104

97105
include/iconv.h.build.in : include/iconv.h.in include/export.h
98106
sed -e 's/extern \([^"]\)/extern LIBICONV_DLL_EXPORTED \1/' \

autogen.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ if test $skip_gnulib = false; then
6060
fi
6161
# Skip the gnulib-tool step if gnulib-tool was not found.
6262
if test -n "$GNULIB_TOOL"; then
63-
make -f Makefile.devel gnulib-clean srclib/Makefile.gnulib GNULIB_TOOL="$GNULIB_TOOL"
63+
make -f Makefile.devel \
64+
gnulib-clean srclib/Makefile.gnulib gnulib-imported-files \
65+
GNULIB_TOOL="$GNULIB_TOOL"
6466
fi
6567
fi
6668

0 commit comments

Comments
 (0)