From f569c4a0425649853516634853159cbe8815dee6 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sun, 3 May 2009 17:21:02 +1000 Subject: makepkg: several small fixes 1) Do not attempt to strip compressed binaries Original-work-by: Marc - A. Dahlhaus 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 Signed-off-by: Dan McGee --- configure.ac | 2 +- etc/makepkg.conf.in | 2 +- scripts/makepkg.sh.in | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a83d5e4d..91411589 100644 --- a/configure.ac +++ b/configure.ac @@ -193,7 +193,7 @@ case "${host_os}" in darwin*) host_os_darwin=yes SIZECMD="/usr/bin/stat -f %z" - SEDINPLACE="sed -i ''" + SEDINPLACE="/usr/bin/sed -i ''" ;; esac diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 76b9eca9..1368ff1f 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -75,7 +75,7 @@ INTEGRITY_CHECK=(md5) #-- Manual (man and info) directories to compress (if zipman is specified) MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) #-- Doc directories to remove (if !docs is specified) -DOC_DIRS=(usr/{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) +DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) #-- Directories to be searched for the strip option (if strip is specified) STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) #-- Files to be removed from all packages (if purge is specified) 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" -- cgit v1.2.3-24-g4f1b