| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | doc/makepkg.8.txt | 4 | ||||
| -rw-r--r-- | scripts/libmakepkg/util/pkgbuild.sh.in | 12 |
diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 460c4e26..a065b795 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -200,8 +200,8 @@ Options useful if you are redirecting makepkg output to file. *\--packagelist*:: - List the packages that would be produced without building. Listed - package names do not include PKGEXT. + List the package filenames that would be produced without building. Listed + package filenames include PKGDEST and PKGEXT. *\--printsrcinfo*:: Generate and print the SRCINFO file to stdout. diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index 2a4bd3af..6cfda0b3 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -149,14 +149,12 @@ print_all_package_names() { local version=$(get_full_version) local architecture pkg opts a for pkg in ${pkgname[@]}; do - get_pkgbuild_attribute "$pkg" 'arch' 1 architecture + architecture=$(get_pkg_arch $pkg) get_pkgbuild_attribute "$pkg" 'options' 1 opts - for a in ${architecture[@]}; do - printf "%s-%s-%s\n" "$pkg" "$version" "$a" - if in_opt_array "debug" ${opts[@]} && in_opt_array "strip" ${opts[@]}; then - printf "%s-%s-%s-%s\n" "$pkg" "@DEBUGSUFFIX@" "$version" "$a" - fi - done + printf "%s/%s-%s-%s%s\n" "$PKGDEST" "$pkg" "$version" "$architecture" "$PKGEXT" + if in_opt_array "debug" ${opts[@]} && in_opt_array "strip" ${opts[@]}; then + printf "%s/%s-%s-%s-%s%s\n" "$PKGDEST" "$pkg" "@DEBUGSUFFIX@" "$version" "$architecture" "$PKGEXT" + fi done } |