File tree Expand file tree Collapse file tree 2 files changed +10
-3
lines changed Expand file tree Collapse file tree 2 files changed +10
-3
lines changed Original file line number Diff line number Diff line change 1+ 2018-01-03 Bruno Haible <bruno@clisp.org>
2+
3+ Fix installation in 64-bit mode on AIX.
4+ * lib/Makefile.in (AR): New variable.
5+ (install): Use it instead of hardcoding 'ar'.
6+
172017-11-26 Bruno Haible <bruno@clisp.org>
28
39 Avoid end-of-lines problem in generated shell scripts on Cygwin.
Original file line number Diff line number Diff line change @@ -30,6 +30,7 @@ LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
3030LIBTOOL_LINK = $(LIBTOOL ) --mode=link
3131LIBTOOL_INSTALL = $(LIBTOOL ) --mode=install
3232LIBTOOL_UNINSTALL = $(LIBTOOL ) --mode=uninstall
33+ AR = @AR@
3334# Windows resource compiler (windres). Used via libtool.
3435RC = @RC@
3536CP = cp
@@ -106,9 +107,9 @@ install : all force
106107 $(LIBTOOL_INSTALL ) $(INSTALL ) libiconv.la $(DESTDIR )$(libdir ) /libiconv.la
107108 case " @host_os@" in \
108109 aix* ) (cd $( DESTDIR) $( libdir) && \
109- objects=` ar t libiconv.a` " " ` ar t /lib/libiconv.a` && \
110- ar x libiconv.a && ar x /lib/libiconv.a && \
111- ar q libiconv.new.a $$ objects && \
110+ objects=` $( AR ) t libiconv.a` " " ` $( AR ) t /lib/libiconv.a` && \
111+ $( AR ) x libiconv.a && $( AR ) x /lib/libiconv.a && \
112+ $( AR ) q libiconv.new.a $$ objects && \
112113 rm -f $$ objects && \
113114 mv -f libiconv.new.a libiconv.a) ;; \
114115 esac
You can’t perform that action at this time.
0 commit comments