Skip to content

Commit fa243a1

Browse files
committed
Fix installation in 64-bit mode on AIX.
1 parent 555ccdd commit fa243a1

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
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+
17
2017-11-26 Bruno Haible <bruno@clisp.org>
28

39
Avoid end-of-lines problem in generated shell scripts on Cygwin.

lib/Makefile.in

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
3030
LIBTOOL_LINK = $(LIBTOOL) --mode=link
3131
LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
3232
LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
33+
AR = @AR@
3334
# Windows resource compiler (windres). Used via libtool.
3435
RC = @RC@
3536
CP = 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

0 commit comments

Comments
 (0)