From 5a944040b849f4834d7b07f9025e8aee5c6ff7c4 Mon Sep 17 00:00:00 2001 From: Laurent GUERBY Date: Fri, 23 Apr 2004 21:06:21 +0000 Subject: Makefile.in: Remove RANLIB_TEST, use -$(RANLIB) including after install. 2004-04-23 Laurent GUERBY * Makefile.in: Remove RANLIB_TEST, use -$(RANLIB) including after install. From-SVN: r81105 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/Makefile.in | 15 +++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'gcc/ada') diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 2d286b4..7a40c97 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2004-04-23 Laurent GUERBY + + * Makefile.in: Remove RANLIB_TEST, use -$(RANLIB) including after + install. + 2004-04-23 Rainer Orth * Make-lang.in (GNATBIND_OBJS): Add s-addope.o. diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in index bafeae6..5c30ccd5 100644 --- a/gcc/ada/Makefile.in +++ b/gcc/ada/Makefile.in @@ -105,10 +105,7 @@ MKDIR = mkdir -p AR = ar AR_FLAGS = rc LS = ls -# How to invoke ranlib. -RANLIB = ranlib -# Test to use to see whether ranlib exists on the system. -RANLIB_TEST = [ -f /usr/bin/ranlib -o -f /bin/ranlib ] +RANLIB = @RANLIB@ SHELL = @SHELL@ PWD_COMMAND = $${PWDCMD-pwd} @@ -1722,8 +1719,9 @@ install-gnatlib: ../stamp-gnatlib $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ done -$(INSTALL_DATA) rts/g-trasym$(objext) $(DESTDIR)$(ADA_RTL_OBJ_DIR) - -for file in rts/*$(arext);do \ + -cd rts; for file in *$(arext);do \ $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ + $(RANLIB) $(DESTDIR)$(ADA_RTL_OBJ_DIR)/$$file; \ done # Install the shared libraries, if any, using $(INSTALL) instead # of $(INSTALL_DATA). The latter may force a mode inappropriate @@ -1811,12 +1809,13 @@ gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2 ifneq ($(PREFIX_OBJS),) $(AR) $(AR_FLAGS) rts/libgccprefix$(arext) $(PREFIX_OBJS); endif - if $(RANLIB_TEST) ; then $(RANLIB) rts/libgnat$(arext); else true; fi + -$(RANLIB) rts/libgnat$(arext) $(AR) $(AR_FLAGS) rts/libgnarl$(arext) \ $(addprefix rts/,$(GNATRTL_TASKING_OBJS)) - if $(RANLIB_TEST) ; then $(RANLIB) rts/libgnarl$(arext); else true; fi + -$(RANLIB) rts/libgnarl$(arext) ifeq ($(GMEM_LIB),gmemlib) - $(AR) $(AR_FLAGS) rts/libgmem$(arext) rts/memtrack.o; + $(AR) $(AR_FLAGS) rts/libgmem$(arext) rts/memtrack.o + -$(RANLIB) rts/libgmem$(arext) endif $(CHMOD) a-wx rts/*.ali touch ../stamp-gnatlib -- cgit v1.1