From c3dfbd06c40d45368fa160b6cfb384163b29336a Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 8 Dec 2006 00:08:54 +0000 Subject: [PATCH] * Makefile.am (install-exec-hook): Fix bug when installing symbolic links as aliases. Problem reported by Mike Frysinger. --- ChangeLog | 3 +++ Makefile.am | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca09d76..3b8017e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-12-07 Paul Eggert + * Makefile.am (install-exec-hook): Fix bug when installing + symbolic links as aliases. Problem reported by Mike Frysinger. + * deflate.c (deflate_fast, deflate): Avoid core dump. Problem originally reported by Jochen Friedrich and trivial patch supplied by Anthony Towns; see . diff --git a/Makefile.am b/Makefile.am index 9ec8c77..4114152 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,16 +79,16 @@ install-exec-hook remove-installed-links: transform='$(transform)'; \ test "X$$prog" = "X$$prog_ext" || \ transform="$$transform"';s/$$/$(EXEEXT)/'; \ - source=$(DESTDIR)$(bindir)/`echo "$$prog"|sed "$$transform"`; \ + destbindir=$(DESTDIR)$(bindir); \ + source=`echo "$$prog"|sed "$$transform"`; \ for alias in $$aliases; do \ - dest=$(DESTDIR)$(bindir)/`echo "$$alias"|sed "$$transform"`; \ + dest=`echo "$$alias"|sed "$$transform"`; \ (set -x; \ + cd "$$destbindir" && \ rm -f "$$dest" && \ case $@ in \ install-exec-hook) \ - for ln in ln "$(LN_S)"; do \ - $$ln "$$source" "$$dest" && break; \ - done;; \ + ln "$$source" "$$dest" || $(LN_S) "$$source" "$$dest";; \ esac \ ) || exit; \ done; \ -- 2.47.2