summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authoruebayasi <uebayasi>2003-01-09 02:21:30 +0000
committeruebayasi <uebayasi>2003-01-09 02:21:30 +0000
commit4828e74d307d73d2d9247db844418bed532a0275 (patch)
tree53a8dce44082d776a05914641531e8eae1474988 /pkgtools
parent3cbc250bc0efb3a9b6dad131886175f257fa2866 (diff)
downloadpkgsrc-4828e74d307d73d2d9247db844418bed532a0275.tar.gz
Update to 2.5.
* Be careful not to print duplicate blanks around buildlinked dependencies.
Diffstat (limited to 'pkgtools')
-rwxr-xr-xpkgtools/createbuildlink/files/createbuildlink11
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgtools/createbuildlink/files/createbuildlink b/pkgtools/createbuildlink/files/createbuildlink
index ff67036df03..4111ddfa3ab 100755
--- a/pkgtools/createbuildlink/files/createbuildlink
+++ b/pkgtools/createbuildlink/files/createbuildlink
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: createbuildlink,v 1.10 2002/10/16 08:53:15 rh Exp $
+# $NetBSD: createbuildlink,v 1.11 2003/01/09 02:21:30 uebayasi Exp $
#
# Copyright (c) 2002 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -39,7 +39,7 @@
# Create an initial buildlink2.mk from a package's Makefile and PLIST
#
-REV=`echo '$Revision: 1.10 $' | sed 's/\\$//g'`
+REV=`echo '$Revision: 1.11 $' | sed 's/\\$//g'`
tmpdir=/tmp
makefile=Makefile
sedrules=$tmpdir/sedrules.buildlink.$$
@@ -166,20 +166,21 @@ echo ""
for i in $makefile $commons ; do
[ ! -f $i ] || grep '^.include.*\.\.\/.*\/.*/buildlink2.mk\"' $i
done
+grep -l '^.include.*\.\.\/.*\/.*/buildlink2.mk\"' $makefile $commons \
+ >/dev/null 2>&1 && echo "" # Be careful not to print duplicate \n
##
## main buildlink target for this package
##
-echo ""
echo "BUILDLINK_TARGETS+= ${PKGNOVER}-buildlink"
+echo ""
##
## buildlink targets for this package
##
-echo ""
echo "${PKGNOVER}-buildlink: _BUILDLINK_USE"
-
echo ""
+
echo ".endif # ${PKGUPPER}_BUILDLINK2_MK"
rm -f $sedrules