Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--etc/makepkg.conf.in2
-rw-r--r--scripts/makepkg.sh.in4
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"