From 27a394d87be90e30578431b27f9e61494c28ca96 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 21 Mar 2000 04:55:08 +0000 Subject: [PATCH] ($(rtld-version-installed-name)): Delay replacing existing rtld-installed-name. ($(rtld-installed-name)): Request libc-$(version) be installed too. replace existing rtld-installed-name using $(symbolic-link-prog). --- elf/Makefile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/elf/Makefile b/elf/Makefile index 6c526437e25..c337755aa14 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +# Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -169,11 +169,18 @@ $(objpfx)libdl.so: $(objpfx)libdl_pic.a $(common-objpfx)libc.so $(objpfx)ld.so ifeq (yes,$(build-shared)) $(inst_slibdir)/$(rtld-version-installed-name): $(objpfx)ld.so $(+force) - $(do-install-program) + $(make-target-directory) + $(INSTALL_PROGRAM) $< $@.new $(inst_slibdir)/$(rtld-installed-name): \ - $(inst_slibdir)/$(rtld-version-installed-name) - $(make-shlib-link) + $(inst_slibdir)/$(rtld-version-installed-name) \ + $(inst_slibdir)/libc-$(version).so + rm -f $@ $< + $(symbolic-link-prog) $<.new $@ + ln $<.new $< + rm -f $@ + $(symbolic-link-prog) $(