Commit 5a944040 by Laurent GUERBY Committed by Laurent Guerby

Makefile.in: Remove RANLIB_TEST, use -$(RANLIB) including after install.

2004-04-23  Laurent GUERBY <laurent@guerby.net>

	* Makefile.in: Remove RANLIB_TEST, use -$(RANLIB) including after
	install.

From-SVN: r81105
parent 99a88816
2004-04-23 Laurent GUERBY <laurent@guerby.net>
* Makefile.in: Remove RANLIB_TEST, use -$(RANLIB) including after
install.
2004-04-23 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> 2004-04-23 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Make-lang.in (GNATBIND_OBJS): Add s-addope.o. * Make-lang.in (GNATBIND_OBJS): Add s-addope.o.
......
...@@ -105,10 +105,7 @@ MKDIR = mkdir -p ...@@ -105,10 +105,7 @@ MKDIR = mkdir -p
AR = ar AR = ar
AR_FLAGS = rc AR_FLAGS = rc
LS = ls LS = ls
# How to invoke ranlib. RANLIB = @RANLIB@
RANLIB = ranlib
# Test to use to see whether ranlib exists on the system.
RANLIB_TEST = [ -f /usr/bin/ranlib -o -f /bin/ranlib ]
SHELL = @SHELL@ SHELL = @SHELL@
PWD_COMMAND = $${PWDCMD-pwd} PWD_COMMAND = $${PWDCMD-pwd}
...@@ -1722,8 +1719,9 @@ install-gnatlib: ../stamp-gnatlib ...@@ -1722,8 +1719,9 @@ install-gnatlib: ../stamp-gnatlib
$(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
done done
-$(INSTALL_DATA) rts/g-trasym$(objext) $(DESTDIR)$(ADA_RTL_OBJ_DIR) -$(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); \ $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
$(RANLIB) $(DESTDIR)$(ADA_RTL_OBJ_DIR)/$$file; \
done done
# Install the shared libraries, if any, using $(INSTALL) instead # Install the shared libraries, if any, using $(INSTALL) instead
# of $(INSTALL_DATA). The latter may force a mode inappropriate # of $(INSTALL_DATA). The latter may force a mode inappropriate
...@@ -1811,12 +1809,13 @@ gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2 ...@@ -1811,12 +1809,13 @@ gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2
ifneq ($(PREFIX_OBJS),) ifneq ($(PREFIX_OBJS),)
$(AR) $(AR_FLAGS) rts/libgccprefix$(arext) $(PREFIX_OBJS); $(AR) $(AR_FLAGS) rts/libgccprefix$(arext) $(PREFIX_OBJS);
endif endif
if $(RANLIB_TEST) ; then $(RANLIB) rts/libgnat$(arext); else true; fi -$(RANLIB) rts/libgnat$(arext)
$(AR) $(AR_FLAGS) rts/libgnarl$(arext) \ $(AR) $(AR_FLAGS) rts/libgnarl$(arext) \
$(addprefix rts/,$(GNATRTL_TASKING_OBJS)) $(addprefix rts/,$(GNATRTL_TASKING_OBJS))
if $(RANLIB_TEST) ; then $(RANLIB) rts/libgnarl$(arext); else true; fi -$(RANLIB) rts/libgnarl$(arext)
ifeq ($(GMEM_LIB),gmemlib) 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 endif
$(CHMOD) a-wx rts/*.ali $(CHMOD) a-wx rts/*.ali
touch ../stamp-gnatlib touch ../stamp-gnatlib
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment