Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=6852fad4c3c235a690893cbccff775d8928b3c8a
commit 6852fad4c3c235a690893cbccff775d8928b3c8a Author: Michel Hermier <[email protected]> Date: Tue Nov 20 07:51:21 2012 +0100 scripts/makepkg * Bring back _subpkgs_removeemptydirfix next to it's definition. diff --git a/scripts/makepkg b/scripts/makepkg index 19797f9..85b40e5 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -1745,6 +1745,8 @@ if [ ! "`check_option NODOCS`" -a "$NODOCS" = "0" ]; then \) -exec install -pm 644 '{}' pkg/usr/share/doc/$pkgname-$pkgver/ \; fi +# NOTE: _P_subpkgsfixes hook registration order is important. + _subpkgs_removeemptydirfix() { # FIXME: Make it more general (detect all dirs and try to remove them) @@ -1758,6 +1760,9 @@ _subpkgs_removeemptydirfix() usr/share/man/ \ 2>/dev/null } +#if ! check_option NOREMOVEEMPTYDIR; then + _P_subpkgsfixes+=(_subpkgs_removeemptydirfix) +#fi _pkg_strip_hook() { @@ -1819,12 +1824,6 @@ do fi done -# NOTE: These should be the latest registered hooks - -#if ! check_option NOREMOVEEMPTYDIR; then -_P_subpkgsfixes+=(_subpkgs_removeemptydirfix) -#fi - do_subpkgsfixes # compress info and manual pages _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
