diff options
| author | Bruno Haible <bruno@clisp.org> | 2011-09-02 21:34:29 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2011-09-02 21:34:29 +0200 |
| commit | e258a174da750f0368f1d72276f56b75a79e79cc (patch) | |
| tree | 73aea6c5580d1c47a4d7a59ca1feb3dd129d4396 | |
| parent | 9dd879315ed34152389cc2283ab252d8e75c04dd (diff) | |
| download | android-libiconv-e258a174da750f0368f1d72276f56b75a79e79cc.tar.gz android-libiconv-e258a174da750f0368f1d72276f56b75a79e79cc.tar.bz2 android-libiconv-e258a174da750f0368f1d72276f56b75a79e79cc.zip | |
Fix "make check" failure when $(srcdir) != $(builddir).
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | tests/Makefile.in | 2 |
2 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,10 @@ +2011-09-02 Bruno Haible <bruno@clisp.org> + + Fix "make check" failure when $(srcdir) != $(builddir). + * tests/Makefile.in (check): When $(srcdir) != ., temporarily copy + GB18030.IRREVERSIBLE.TXT into the build directory. + Reported by Christian Weisgerber <naddy@mips.inka.de>. + 2011-08-07 Bruno Haible <bruno@clisp.org> Ensure all HTML-formatted man pages are up-to-date. diff --git a/tests/Makefile.in b/tests/Makefile.in index 5af5c74..1720ce3 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -128,7 +128,9 @@ check : all table-from table-to ../src/iconv_no_i18n test-shiftseq test-to-wchar $(srcdir)/check-stateless $(srcdir) CP936 $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(srcdir)/gengb18030z.c ../srclib/libicrt.a -o gengb18030z && \ { cat $(srcdir)/GB18030-BMP.TXT ; ./gengb18030z ; } | sort > GB18030.TXT && \ + { test $(srcdir) = . || cp $(srcdir)/GB18030.IRREVERSIBLE.TXT GB18030.IRREVERSIBLE.TXT; } && \ $(srcdir)/check-stateless . GB18030 && \ + { test $(srcdir) = . || $(RM) GB18030.IRREVERSIBLE.TXT; } && \ $(RM) -r gengb18030z@EXEEXT@ gengb18030z.dSYM GB18030.TXT $(srcdir)/check-stateful $(srcdir) ISO-2022-CN $(srcdir)/check-stateful $(srcdir) ISO-2022-CN-EXT |