Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=316cc0a4273a8a14ffe5547d4ac8bd7ae68d72aa
commit 316cc0a4273a8a14ffe5547d4ac8bd7ae68d72aa Author: Michel Hermier <[email protected]> Date: Tue Nov 20 11:30:56 2012 +0100 scripts/makepkg * Move info and man compatibility dir moving to some dedicated hooks. diff --git a/scripts/makepkg b/scripts/makepkg index 5e4d514..97ad18f 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -1760,8 +1760,7 @@ _pkg_nodocumentation_hook() { rm -rf \ usr/doc \ - usr/share/doc/"$1-$pkgver" \ - + usr/share/doc/"$1-$pkgver" } if [ ! "`check_option NODOCS`" -a "$NODOCS" = "0" ]; then _P_subpkgsfixes+=(_pkg_documentation_hook) @@ -1769,6 +1768,28 @@ else _P_subpkgsfixes+=(_pkg_nodocumentation_hook) fi +_pkg_move_info_hook() +{ + # move /usr/info files to /usr/share/info + if [ -d usr/info ]; then + mkdir -p usr/share/info + mv usr/info/* usr/share/info/ + rmdir usr/info + fi +} +_P_subpkgsfixes+=(_pkg_move_info_hook) + +_pkg_move_man_hook() +{ + # move /usr/man files to /usr/share/man + if [ -d usr/man ]; then + mkdir -p usr/share/man + mv usr/man/* usr/share/man/ + rmdir usr/man + fi +} +_P_subpkgsfixes+=(_pkg_move_man_hook) + _subpkgs_removeemptydirfix() { # FIXME: Make it more general (detect all dirs and try to remove them) @@ -1820,18 +1841,6 @@ for d in $startdir/{pkg,pkg.*} do [ ! -d $d ] && continue - # move /usr/info files to /usr/share/info - if [ -d $d/usr/info ]; then - mkdir -p $d/usr/share/info - mv $d/usr/info/* $d/usr/share/info/ - fi - - # move /usr/man files to /usr/share/man - if [ -d $d/usr/man ]; then - mkdir -p $d/usr/share/man - mv $d/usr/man/* $d/usr/share/man/ - fi - if [ -d "$d/usr/share/icons/hicolor" ]; then if [ -z "$_F_gnome_iconcache" ]; then warning "Package $pkgname contains hicolor icons but _F_gnome_iconcache is not set" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
