diff options
| author | guerby <guerby@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-23 21:06:21 +0000 |
|---|---|---|
| committer | guerby <guerby@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-23 21:06:21 +0000 |
| commit | 4748171af0a3b161a4e1688b4ee1d2ab14fdc6ef (patch) | |
| tree | c31d908fc80a30de5005608eb7da48ac8a98400c /gcc/ada | |
| parent | 9425f3682947711a9c51166c3d3381ea018aea02 (diff) | |
| download | gcc-4748171af0a3b161a4e1688b4ee1d2ab14fdc6ef.tar.gz | |
2004-04-23 Laurent GUERBY <laurent@guerby.net>
* Makefile.in: Remove RANLIB_TEST, use -$(RANLIB) including after
install.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81105 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/Makefile.in | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 2d286b48921..7a40c977510 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +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> * Make-lang.in (GNATBIND_OBJS): Add s-addope.o. diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in index bafeae67aa6..5c30ccd5daa 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 |