summaryrefslogtreecommitdiff
path: root/oldXMenu
diff options
context:
space:
mode:
authorUlrich Mueller <ulm@gentoo.org>2012-10-05 20:42:28 -0400
committerGlenn Morris <rgm@gnu.org>2012-10-05 20:42:28 -0400
commit150798c5ac7953c0fd56cffd3b3720015528d820 (patch)
treee5420302cb47e611ed491cc213fd31c9177e2f5d /oldXMenu
parent7fa36ccb71d0def28bc3f8eb17827fc870bd7ca2 (diff)
downloademacs-150798c5ac7953c0fd56cffd3b3720015528d820.tar.gz
Let configure set ar and associated flags
* lwlib/Makefile.in (AR, ARFLAGS): * oldXMenu/Makefile.in (AR, ARFLAGS): Get values from configure. Fixes: debbugs:12549
Diffstat (limited to 'oldXMenu')
-rw-r--r--oldXMenu/ChangeLog4
-rw-r--r--oldXMenu/Makefile.in6
2 files changed, 7 insertions, 3 deletions
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 09859d0d630..133b18b4e3f 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-06 Ulrich Müller <ulm@gentoo.org>
+
+ * Makefile.in (AR, ARFLAGS): Get values from configure.
+
2012-06-26 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in (ALL_CFLAGS): Add -I../lib -I${srcdir}/../lib.
diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index 00b3d8e3c69..ee78325f0d7 100644
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -57,8 +57,8 @@ CFLAGS=@CFLAGS@
TAGS = etags
RM = rm -f
RANLIB = @RANLIB@
-# Solaris 2.1 ar doesn't accept the 'l' option.
-AR = ar cq
+AR = @AR@
+ARFLAGS = @ARFLAGS@
OBJS = Activate.o \
AddPane.o \
@@ -98,7 +98,7 @@ ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
libXMenu11.a: $(OBJS) $(EXTRA)
$(RM) $@
- $(AR) $@ $(OBJS) $(EXTRA)
+ $(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA)
$(RANLIB) $@
Activate.o: Activate.c XMenuInt.h XMenu.h X10.h