Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=1810c19d09ce1f1a60cd7f50618243b86ae2cafe

commit 1810c19d09ce1f1a60cd7f50618243b86ae2cafe
Author: Michel Hermier <[email protected]>
Date:   Mon Nov 19 13:43:47 2012 +0100

scripts/makepkg

* Use _P_archive_names in do_subpkgsfixes

diff --git a/scripts/makepkg b/scripts/makepkg
index 30129d3..830c934 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -1739,21 +1739,21 @@ _subpkgs_removeemptydirfix()
usr/info/
usr/man/
usr/share/doc/$pkgname-$pkgver/ \
-               usr/share/man/
+               usr/share/man/ \
2>/dev/null
}

do_subpkgsfixes()
{
-       local subpkgdir hook
+       local hook package_name

-       for subpkgdir in ${startdir}/{pkg,pkg.*}
+       for package_name in "${_P_package_names[@]}"
do
-               [ ! -d "${subpkgdir}" ] && continue
+               [ ! -d "${startdir}/pkg.${package_name}" ] && continue
for hook in "${_P_subpkgsfixes[@]}"
do
-                       cd "${subpkgdir}"
-                       "${hook}" "${subpkgdir}"
+                       cd "${startdir}/pkg.${package_name}"
+                       "${hook}" "${package_name}"
done
done
}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to