diff options
author | KO Myung-Hun <komh@chollian.net> | 2011-06-04 19:10:38 +0200 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2011-06-04 19:10:38 +0200 |
commit | bf56aea7f485498ec63d69a0d33e6cad224c0744 (patch) | |
tree | f72e4aee71cb9ccd1b38137cffa8c94a6b933e7d | |
parent | 891a7930cfe52bcbb8e7b7d3a1a0e098b29d2fdb (diff) | |
download | android-libiconv-bf56aea7f485498ec63d69a0d33e6cad224c0744.tar.gz android-libiconv-bf56aea7f485498ec63d69a0d33e6cad224c0744.tar.bz2 android-libiconv-bf56aea7f485498ec63d69a0d33e6cad224c0744.zip |
Fix installation on OS/2.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | src/Makefile.in | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2011-03-27 KO Myung-Hun <komh@chollian.net> + + Fix installation on OS/2. + * src/Makefile.in (all, iconv_no_i18n): Add $(EXEEXT) suffix to + iconv_no_i18n. This is the recommended way to use libtool, see + <http://lists.gnu.org/archive/html/bug-libtool/2009-04/msg00013.html>. + 2011-03-31 Bruno Haible <bruno@clisp.org> gentranslit: Fix buffer overrun. diff --git a/src/Makefile.in b/src/Makefile.in index b2f5c6f..bea1e2c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -70,11 +70,11 @@ OBJECTS_RES_no = # i.e. during "make install". The intermediate 'iconv' executable is built # without internationalization and not linked with libintl. -all : iconv_no_i18n iconv.@OBJEXT@ $(OBJECTS_RES_@WOE32@) +all : iconv_no_i18n$(EXEEXT) iconv.@OBJEXT@ $(OBJECTS_RES_@WOE32@) test `ls -ld . | sed -e 's/^d\(.........\).*/\1/'` = rwxrwxrwx || chmod 777 . # This is the temporary iconv executable, without internationalization. -iconv_no_i18n : iconv_no_i18n.@OBJEXT@ ../lib/libiconv.la $(OBJECTS_RES_@WOE32@) +iconv_no_i18n$(EXEEXT) : iconv_no_i18n.@OBJEXT@ ../lib/libiconv.la $(OBJECTS_RES_@WOE32@) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) iconv_no_i18n.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la $(OBJECTS_RES_@WOE32@) -o $@ iconv_no_i18n.@OBJEXT@ : $(srcdir)/iconv_no_i18n.c $(srcdir)/iconv.c |