Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=3922d5346e4aeb7d3c652e9b8d34c876197447f8
commit 3922d5346e4aeb7d3c652e9b8d34c876197447f8
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Mon Jan 21 04:00:24 2008 +0100
makepkg: post_build fixes for subpkgs
never use pkg/ directly but in a for i in {pkg,pkg.*} form
closes #2610
diff --git a/scripts/makepkg b/scripts/makepkg
index f3d18de..9927e73 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -1491,39 +1491,48 @@ done
# documentation
msg "Preparing package documentation..."
-if [ -d pkg/usr/doc ]; then
- mkdir -p pkg/usr/share/doc
- cp -a pkg/usr/doc/* pkg/usr/share/doc/
- rm -rf pkg/usr/doc
+for d in $startdir/{pkg,pkg.*}
+do
+if [ -d $d/usr/doc ]; then
+ mkdir -p $d/usr/share/doc
+ cp -a $d/usr/doc/* $d/usr/share/doc/
+ rm -rf $d/usr/doc
fi
if [ ! "`check_option NODOCS`" -a "$NODOCS" = "0" ]; then
- mkdir -p pkg/usr/share/doc/$pkgname-$pkgver
+ mkdir -p $d/usr/share/doc/$pkgname-$pkgver
for i in `find src -maxdepth 2 -name ANNOUNCE -o -name AUTHORS -o -name *BUGS*
-o -name CHANGES -o -name CONFIGURATION -o -name *COPYING* -o -name *COPYRIGHT*
-o -name CREDITS -o -name ChangeLog -o -name Changelog -o -name CHANGELOG -o
-name CONTRIBUTORS -o -name *FAQ* -o -name FEATURES -o -name FILES -o -name
HACKING -o -name History -o -name HISTORY -o -name INSTALL* -o -name LICENSE -o
-name LSM -o -name MANIFEST -o -name NEWS -o -name *README* -o -name *Readme*
-o -name SITES -o -name *RELEASE* -o -name RELNOTES -o -name THANKS -o -name
TIPS -o -name TODO -o -name VERSION -o -name CONFIGURATION* -o -name GPLLicense`
do
- cp -a $i pkg/usr/share/doc/$pkgname-$pkgver/
+ cp -a $i $d/usr/share/doc/$pkgname-$pkgver/
done
fi
# remove /usr/share/doc/$pkgname-$pkgver directory if empty
-if [ -d pkg/usr/share/doc/$pkgname-$pkgver ]; then
- rmdir -p --ignore-fail-on-non-empty pkg/usr/share/doc/$pkgname-$pkgver
2> /dev/null
+if [ -d $d/usr/share/doc/$pkgname-$pkgver ]; then
+ rmdir -p --ignore-fail-on-non-empty $d/usr/share/doc/$pkgname-$pkgver
2> /dev/null
mkdir -p pkg
fi
# move /usr/info files to /usr/share/info
-if [ -d pkg/usr/info ]; then
- mkdir -p pkg/usr/share/info
- cp -a pkg/usr/info/* pkg/usr/share/info/
- rm -rf pkg/usr/info
+if [ -d $d/usr/info ]; then
+ mkdir -p $d/usr/share/info
+ cp -a $d/usr/info/* $d/usr/share/info/
+ rm -rf $d/usr/info
fi
# move /usr/man files to /usr/share/man
-if [ -d pkg/usr/man ]; then
- mkdir -p pkg/usr/share/man
- cp -a pkg/usr/man/* pkg/usr/share/man/
- rm -rf pkg/usr/man
+if [ -d $d/usr/man ]; then
+ mkdir -p $d/usr/share/man
+ cp -a $d/usr/man/* $d/usr/share/man/
+ rm -rf $d/usr/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"
+ fi
+fi
+done
+
# compress info and manual pages
msg "Compressing info and manual pages..."
find $startdir/{pkg,pkg.*}/{usr{,/local,/share},opt/*}/{info,man} -type f
2>/dev/null | while read i ; do
@@ -1560,23 +1569,6 @@ for d in $startdir/{pkg,pkg.*} ; do
done
done
-if [ -d "$startdir/pkg/usr/share/icons/hicolor" ]; then
- if [ -z "$_F_gnome_iconcache" ]; then
- warning "Package $pkgname contains hicolor icons but
_F_gnome_iconcache is not set"
- fi
-fi
-
-if [ -n "$subpkgs" ]; then
- for subpkg in "[EMAIL PROTECTED]"
- do
- if [ -d "$startdir/pkg.$subpkg/usr/share/icons/hicolor" ]; then
- if [ -z "$_F_gnome_iconcache" ]; then
- warning "Package $subpkg contains hicolor icons
but _F_gnome_iconcache is not set"
- fi
- fi
- done
-fi
-
# strip binaries
strip_pkg $pkgname
if [ -n "$subpkgs" ]; then
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
