summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-05-06 00:29:09 -0700
committerGlenn Morris <rgm@gnu.org>2010-05-06 00:29:09 -0700
commite49dca3dd47ecfbf821196272fc2b5906a92c2d6 (patch)
treedf1e28946464ee75321c8a9e5f36331707dcb0e7
parente3cf0cded8bed77323873044d2ad2db8d92f3621 (diff)
downloademacs-e49dca3dd47ecfbf821196272fc2b5906a92c2d6.tar.gz
Let configure handle ranlib.
* oldXMenu/Makefile.in (RANLIB): Let configure set it. (libXMenu11.a): configure sets RANLIB = : on systems without it.
-rw-r--r--oldXMenu/ChangeLog3
-rw-r--r--oldXMenu/Makefile.in8
2 files changed, 5 insertions, 6 deletions
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 365ff1f98a9..b17a3b2eda9 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,5 +1,8 @@
2010-05-06 Glenn Morris <rgm@gnu.org>
+ * Makefile.in (RANLIB): Let configure set it.
+ (libXMenu11.a): configure sets RANLIB = : on systems without it.
+
* Makefile.in (CPP, LN_S, AS, LD, MV, LS, LINTOPTS, LINTLIBFLAG, MAKE)
(STD_DEFINES, CDEBUGFLAGS, RM_CMD): Remove unused variables.
diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index b1d6ea5d814..5e2e2f6fb9d 100644
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -55,7 +55,7 @@ CC=@CC@
CFLAGS=@CFLAGS@
TAGS = etags
RM = rm -f
-RANLIB = ranlib
+RANLIB = @RANLIB@
# Solaris 2.1 ar doesn't accept the 'l' option.
AR = ar cq
@@ -97,11 +97,7 @@ ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
libXMenu11.a: $(OBJS) $(EXTRA)
$(RM) $@
$(AR) $@ $(OBJS) $(EXTRA)
- @echo Do not be alarmed if the following ranlib command
- @echo fails due to the absence of a ranlib program on your system.
- -$(RANLIB) $@ || true
-#If running ranlib fails, probably there is none.
-#That's ok. So don't stop the build.
+ $(RANLIB) $@
Activate.o: Activate.c XMenuInt.h XMenu.h X10.h
AddPane.o: AddPane.c XMenuInt.h XMenu.h X10.h