From 05463eaf611f4784b3693b74029c3f5a6da1d70b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 27 Jul 2013 00:52:27 -0600 Subject: librefetch: fix $pkgdir handling for new-ish versions of makepkg --- src/librefetch/librefetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/librefetch/librefetch b/src/librefetch/librefetch index e039e12..168d30e 100755 --- a/src/librefetch/librefetch +++ b/src/librefetch/librefetch @@ -221,8 +221,8 @@ makepkg_modify=' /^\}$/ifind . -exec touch --date="1990-01-01 0:0:0 +0" {} + } -s|srcdir=.*|srcdir="$BUILDDIR/src-libre"| -s|pkgdir=.*|pkgdir="$BUILDDIR/pkg-libre"| +s|srcdir=.*|&-libre| +s|pkgdirbase=.*|&-libre| s|check_build_status$|:| ' @@ -289,7 +289,7 @@ PURGE_TARGETS+=(.bzr/ .cvs/ .git/ .hg/ .svn/) if ! declare -f mksource >/dev/null; then mksource() { :; } fi -prepare() { rm -rf "$pkgdir"; } +prepare() { :; } build() { mksource; } check() { :; } package() { cp -a "$srcdir"/*/ "$pkgdir/"; } -- cgit v1.2.2