Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=f4f527c95bedd4c14bac13bbad7233a01309d41e
commit f4f527c95bedd4c14bac13bbad7233a01309d41e
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Thu Jan 24 01:39:05 2008 +0100
makepkg: fix for the 'removing unwanted files' warning
again, as the check if subpkgs are available or not was not valid
diff --git a/scripts/makepkg b/scripts/makepkg
index 3a31dd2..b101a69 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -1476,7 +1476,7 @@ cd $startdir
# unwanted files
msg "Removing unwanted files..."
extra=
-[ -n "$subpkgs" ] && extra=pkg.*/usr/lib/perl?
+ls pkg.* &>/dev/null && extra=pkg.*/usr/lib/perl?
for f in `find pkg/usr/lib/perl? $extra -type f 2> /dev/null` ; do
case "$f" in
*/.packlist|*/perllocal.pod)
@@ -1486,7 +1486,7 @@ for f in `find pkg/usr/lib/perl? $extra -type f 2>
/dev/null` ; do
esac
done
extra=
-[ -n "$subpkgs" ] && extra=pkg.*
+ls pkg.* &>/dev/null && extra=pkg.*
rm -f {pkg,pkg.*}/{usr{,/local,/share},opt/*}/info/dir 2> /dev/null
for f in `find pkg $extra -type f -name encodings.dir -o -type f -name
fonts.dir -o -type f -name fonts.scale` ; do
msg2 "`echo $f | sed 's|pkg[^/]\+||'`"
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
