]>
Commit | Line | Data |
---|---|---|
40e856e0 | 1 | diff -uNr libiconv-1.8/configure.in libiconv-1.8.good/configure.in |
2 | --- libiconv-1.8/configure.in 2003-01-31 21:19:00.000000000 +0100 | |
3 | +++ libiconv-1.8.good/configure.in 2003-08-23 22:49:42.000000000 +0200 | |
4 | @@ -56,7 +56,6 @@ | |
5 | ||
6 | dnl check for host type | |
7 | ||
8 | -CL_CANONICAL_HOST(autoconf) | |
9 | ||
10 | dnl checks for UNIX variants that set DEFS | |
11 | ||
12 | @@ -82,7 +81,6 @@ | |
13 | ||
14 | dnl checks for typedefs | |
15 | ||
16 | -AC_MBSTATE_T | |
17 | ||
18 | dnl checks for functions and declarations | |
19 | ||
20 | @@ -95,7 +93,6 @@ | |
21 | ||
22 | AC_CHECK_FUNCS(mbrtowc wcrtomb mbsinit setlocale) | |
23 | ||
24 | -AC_EILSEQ | |
25 | ||
26 | CL_WORDS_LITTLEENDIAN | |
27 | ||
28 | diff -uNr libiconv-1.8/Makefile.in libiconv-1.8.good/Makefile.in | |
29 | --- libiconv-1.8/Makefile.in 2003-01-31 21:07:37.000000000 +0100 | |
30 | +++ libiconv-1.8.good/Makefile.in 2003-08-23 23:35:55.000000000 +0200 | |
31 | @@ -38,8 +38,8 @@ | |
32 | # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. | |
33 | install-lib : all force | |
34 | cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)' | |
35 | - if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi | |
36 | - $(INSTALL_DATA) include/iconv.h $(includedir)/iconv.h | |
37 | + if [ ! -d $(DESTDIR)$(includedir) ] ; then mkdir $(DESTDIR)$(includedir) ; fi | |
38 | + $(INSTALL_DATA) $(DESTDIR)/include/iconv.h $(DESTDIR)$(includedir)/iconv.h | |
39 | ||
40 | install : force | |
41 | cd libcharset && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' | |
42 | diff -uNr libiconv-1.8/src/Makefile.in libiconv-1.8.good/src/Makefile.in | |
43 | --- libiconv-1.8/src/Makefile.in 2003-01-31 21:08:08.000000000 +0100 | |
44 | +++ libiconv-1.8.good/src/Makefile.in 2003-08-23 23:34:22.000000000 +0200 | |
45 | @@ -78,7 +78,7 @@ | |
46 | if [ ! -d $(DESTDIR)$(bindir) ] ; then mkdir $(DESTDIR)$(bindir) ; fi | |
47 | case "@host_os@" in \ | |
48 | hpux*) $(CC) $(LDFLAGS) iconv.@OBJEXT@ -L$(libdir) -liconv @LIBINTL@ -o iconv;; \ | |
49 | - *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ $(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \ | |
50 | + *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \ | |
51 | esac | |
52 | $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv | |
53 |