bug-gzip
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[patch] fix install of symlinks with DESTDIR in gzip-1.3.7


From: Mike Frysinger
Subject: [patch] fix install of symlinks with DESTDIR in gzip-1.3.7
Date: Thu, 7 Dec 2006 08:21:56 -0500
User-agent: KMail/1.9.5

if `ln` fails during install, the fallback is $(LN_S) and $(DESTDIR) is used 
in the target file path which can easily install bogus symlinks ... patch 
attached to fix this issue
-mike

Attachment: pgpSz8TbfZEUM.pgp
Description: PGP signature

2006-12-07  Mike Frysinger  <address@hidden>

        * Makefile.am (install-exec-hook): Fix symlink targets with DESTDIR.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gzip/gzip/Makefile.am,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile.am
--- Makefile.am 7 Dec 2006 07:23:35 -0000       1.15
+++ Makefile.am 7 Dec 2006 13:20:30 -0000
@@ -79,7 +79,8 @@ 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"`; \
+         sourcebase=`echo "$$prog"|sed "$$transform"`; \
+         source=$(DESTDIR)$(bindir)/$$sourcebase; \
          for alias in $$aliases; do \
            dest=$(DESTDIR)$(bindir)/`echo "$$alias"|sed "$$transform"`; \
            (set -x; \
@@ -87,7 +88,10 @@ install-exec-hook remove-installed-links
             case $@ in \
             install-exec-hook) \
               for ln in ln "$(LN_S)"; do \
-                $$ln "$$source" "$$dest" && break; \
+                case $$ln in \
+                  ln) $$ln "$$source" "$$dest" && break;; \
+                  *) $$ln "$$sourcebase" "$$dest" && break;; \
+                esac; \
               done;; \
             esac \
            ) || exit; \

reply via email to

[Prev in Thread] Current Thread [Next in Thread]