From 06255e8ec4b123c94c5f1e6acfdc3c1be18100db Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Tue, 7 Jan 2003 07:34:08 +0000
Subject: Don't complain about (correct) .buildlink leakage in the fake libtool
 archive case.  Also output errors to stderr, not stdout (duh!).

---
 mk/buildlink2/libtool-fix-la | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'mk')

diff --git a/mk/buildlink2/libtool-fix-la b/mk/buildlink2/libtool-fix-la
index 545c2d3b154..c40bd5a83dd 100644
--- a/mk/buildlink2/libtool-fix-la
+++ b/mk/buildlink2/libtool-fix-la
@@ -1,4 +1,4 @@
-# $NetBSD: libtool-fix-la,v 1.16 2003/01/06 09:06:09 jlam Exp $
+# $NetBSD: libtool-fix-la,v 1.17 2003/01/07 07:34:08 jlam Exp $
 #
 # For *.la files, in the "relink_command" line, we make the following
 # replacements:
@@ -181,9 +181,10 @@ if $test -f $lafile; then
 		) > ${laifile}
 		@RM@ -f ${laifile}.tmp
 		$echo "==> Fixed $laifile" >> $wrapperlog
-		if @EGREP@ "${BUILDLINK_X11_DIR}|${BUILDLINK_DIR}" $laifile >/dev/null 2>&1; then
+		if $test "$libdir" != "${BUILDLINK_DIR}/.tmp/inst" && \
+		   @EGREP@ "${BUILDLINK_X11_DIR}|${BUILDLINK_DIR}" $laifile >/dev/null 2>&1; then
 			$echo "==> [buildlink2] Error: buildlink2 leakage into $laifile" >> $wrapperlog
-			$echo "==> [buildlink2] Error: buildlink2 leakage into $laifile"
+			$echo "==> [buildlink2] Error: buildlink2 leakage into $laifile" 1>&2
 			wrapper_result=1
 		fi
 	fi
-- 
cgit v1.2.3