Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=ef4976c07f9300f073fdf50c9f9d97a9d0f66580
commit ef4976c07f9300f073fdf50c9f9d97a9d0f66580 Author: Michel Hermier <[email protected]> Date: Tue Nov 20 12:18:08 2012 +0100 scripts/makepkg * Make the lastest changes actually work (I was testing with the wrong makepkg copy). diff --git a/scripts/makepkg b/scripts/makepkg index 97ad18f..c4e29c8 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -451,12 +451,11 @@ mkdir_subpkgs() done # Compatibility - ln -s "$startdir/pkg" "pkg.${_P_package_names[0]}" + ln -s "pkg.${_P_package_names[0]}" "$startdir/pkg" } rmdir_subpkgs() { - # check for existing pkg.* directories if [ "$(ls $startdir/{pkg,pkg.*} 2> /dev/null | wc -l)" -gt 0 ]; then msg "Removing existing pkg and pkg.* directories..." rm -rf $startdir/{pkg,pkg.*} @@ -995,7 +994,7 @@ if [ ! -z "$subpkgs" ]; then fi # Compatibility adaptation -if [ "${#_P_package_names[@]}" -gt 0 ]; then +if [ "${#_P_package_names[@]}" -eq 0 ]; then _P_options="${options[*]}" _P_package_names=("${pkgname}" "${subpkgs[@]}") _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
