* Makefile.am (install-exec-hook): Fix bug when installing

symbolic links as aliases.  Problem reported by Mike Frysinger.

diff --git a/ChangeLog b/ChangeLog
index ca09d7641347eb01969b074788b9d54aefbdc0a7..3b8017e5d303ee745f204c3555eec7b718460ca6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-12-07  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * 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 <http://bugs.debian.org/184057>.

diff --git a/Makefile.am b/Makefile.am
index 9ec8c77d03d043cc3ce3a231091de9341dcbd989..411415291732a1b8a1a21697d32ac54ad728bb74 100644 (file)
--- 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; \