From 1719dd0aae3530a6f2428783efea6913b1784530 Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Sun, 20 Feb 2005 12:28:38 +0000 Subject: [PATCH] Add explicit command var for GNU sed Add _vdocdir helper var which points to the fully expanded location of documentation Fix ugly file not found output from ls --- buildpkg.functions | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/buildpkg.functions b/buildpkg.functions index 2de082a..d2b7ff7 100644 --- a/buildpkg.functions +++ b/buildpkg.functions @@ -46,6 +46,7 @@ XARGS=/usr/bin/xargs CAT=/usr/bin/cat AWK=/usr/bin/nawk # This must be nawk or GNU awk - plain /usr/bin/awk will *not* work SED=/usr/bin/sed +GSED=/usr/local/bin/sed SORT=/usr/bin/sort CUT=/usr/bin/cut LS=/usr/bin/ls @@ -91,6 +92,7 @@ configure_args='--prefix=$prefix --disable-nls' # Docdir relative to $prefix _docdir=share/doc +_vdocdir=${_docdir}/${topdir}-${version} # Other relative dirs _bindir=bin _sbindir=sbin @@ -383,7 +385,7 @@ do_autonuke() didnuke=1 fi fi - if [ -d "${_libdir}" -a ! -z "$($LS ${_libdir}/*.la)" ]; then + if [ -d "${_libdir}" -a ! -z "$($LS ${_libdir}/*.la 2>/dev/null)" ]; then for i in ${_libdir}/*.la do echo "Nuking $i"