diff options
| author | Allan McRae <allan@archlinux.org> | 2009-05-03 17:21:02 +1000 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-05-11 21:23:46 -0500 |
| commit | f569c4a0425649853516634853159cbe8815dee6 (patch) | |
| tree | ebeba39bfb47be53917418eda5927fec91629b64 /scripts | |
| parent | ed848b1c54e520db760760f1db2e79414cf39bf6 (diff) | |
| download | pacman-f569c4a0425649853516634853159cbe8815dee6.tar.xz | |
makepkg: several small fixes
1) Do not attempt to strip compressed binaries
Original-work-by: Marc - A. Dahlhaus <mad@wol.de>
2) Add "\" in "GPL\'ed" so quote mark does not break source code highlighting
3) Add local to docdir paths in makepkg.conf for consistency
4) Use full path to sed in MacOSX in case users have GNU sed earlier in
path
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/makepkg.sh.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b8e09f50..d978107f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -846,6 +846,8 @@ tidy_install() { local binary find ${STRIP_DIRS[@]} -type f 2>/dev/null | while read binary ; do case "$(file -biz "$binary")" in + *compressed-encoding*) # Skip compressed binarys + ;; *application/x-sharedlib*) # Libraries (.so) /usr/bin/strip -S "$binary";; *application/x-archive*) # Libraries (.a) @@ -952,7 +954,7 @@ create_package() { # warn if license array is not present or empty if [ -z "$license" ]; then warning "$(gettext "Please add a license line to your %s!")" "$BUILDSCRIPT" - plain "$(gettext "Example for GPL'ed software: license=('GPL').")" + plain "$(gettext "Example for GPL\'ed software: license=('GPL').")" fi local comp_files=".PKGINFO" |