Source-Changes-HG archive

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

[src/trunk]: src/usr.bin/xinstall Only trust STRIP from environment if it is ...



details:   https://anonhg.NetBSD.org/src/rev/3eb81dab108e
branches:  trunk
changeset: 748663:3eb81dab108e
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Oct 30 20:57:30 2009 +0000

description:
Only trust STRIP from environment if it is non-empty. Some packages set
STRIP in Makefiles and that makes install -s fail badly. OK apb@

diffstat:

 usr.bin/xinstall/xinstall.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 5cfb4c9b66f3 -r 3eb81dab108e usr.bin/xinstall/xinstall.c
--- a/usr.bin/xinstall/xinstall.c       Fri Oct 30 18:55:45 2009 +0000
+++ b/usr.bin/xinstall/xinstall.c       Fri Oct 30 20:57:30 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xinstall.c,v 1.112 2009/07/25 11:45:58 gson Exp $      */
+/*     $NetBSD: xinstall.c,v 1.113 2009/10/30 20:57:30 joerg Exp $     */
 
 /*
  * Copyright (c) 1987, 1993
@@ -46,7 +46,7 @@
 #if 0
 static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93";
 #else
-__RCSID("$NetBSD: xinstall.c,v 1.112 2009/07/25 11:45:58 gson Exp $");
+__RCSID("$NetBSD: xinstall.c,v 1.113 2009/10/30 20:57:30 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -961,7 +961,7 @@
        const char * volatile stripprog, *progname;
        char *cmd;
 
-       if ((stripprog = getenv("STRIP")) == NULL) {
+       if ((stripprog = getenv("STRIP")) == NULL || *stripprog == '\0') {
 #ifdef TARGET_STRIP
                stripprog = TARGET_STRIP;
 #else



Home | Main Index | Thread Index | Old Index