pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/net/samba Don't use .for with on-demand expanded varia...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/36e9cb1e39ea
branches:  trunk
changeset: 520199:36e9cb1e39ea
user:      tv <tv%pkgsrc.org@localhost>
date:      Tue Oct 17 11:29:36 2006 +0000

description:
Don't use .for with on-demand expanded variables that depend on an
extracted source tree.  That expands them at parse time, and without the
source tree, causes all kinds of headaches in bmake, e.g.

/usr/bin/awk: can't open file /export/SRC/netbsd/pkgsrc/net/samba/work.i386/samba-3.0.22/source/Makefile.in source line number 1
make: "/usr/bin/awk -F= '/^LIBMSRPC_MAJOR/ { print $2; }'        /export/SRC/netbsd/pkgsrc/net/samba/work.i386/samba-3.0.22/source/Makefile.in" returned non-zero status

Rewrite to use a shell loop.

diffstat:

 net/samba/Makefile |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (24 lines):

diff -r dd2efa8581a7 -r 36e9cb1e39ea net/samba/Makefile
--- a/net/samba/Makefile        Tue Oct 17 09:49:47 2006 +0000
+++ b/net/samba/Makefile        Tue Oct 17 11:29:36 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.166 2006/10/17 05:46:09 rillig Exp $
+# $NetBSD: Makefile,v 1.167 2006/10/17 11:29:36 tv Exp $
 
 .include "Makefile.mirrors"
 
@@ -137,10 +137,10 @@
 .PHONY: install-samba-lib-symlinks
 install-samba-lib-symlinks:
 .for l in ${SMBLIBS}
-.  for v in ${SMBVERSION.${l}}
-       cd ${SAMBA_LIBDIR} && rm -f lib${l}.so.${v}                     \
-       && ln -s lib${l}.so lib${l}.so.${v}
-.  endfor
+       for v in ${SMBVERSION.${l}}; do                                 \
+               (cd ${SAMBA_LIBDIR} && rm -f lib${l}.so.$$v &&          \
+                       ln -s lib${l}.so lib${l}.so.$$v);               \
+       done
 .endfor
 
 post-extract:



Home | Main Index | Thread Index | Old Index