summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Benjamin Trigona-Harany2018-03-18 05:46:53 +0100
committer Willy Sudiarto Raharjo2018-03-24 00:50:34 +0100
commitb8a07a9b0a807357cbc1b0f2d095d70185955d0e (patch)
tree0c92c32cdcc9e45ec01e20a040930c9047e737cc
parent8381fae178d6bda2b1540ff7a97bfefa0105e907 (diff)
downloadslackbuilds-b8a07a9b0a807357cbc1b0f2d095d70185955d0e.tar.gz
libraries/lua-lpeg: Script clean up.
Signed-off-by: Benjamin Trigona-Harany <bosth@alumni.sfu.ca>
-rw-r--r--libraries/lua-lpeg/lua-lpeg.SlackBuild14
1 files changed, 6 insertions, 8 deletions
diff --git a/libraries/lua-lpeg/lua-lpeg.SlackBuild b/libraries/lua-lpeg/lua-lpeg.SlackBuild
index 0c0f08465f..dd0f83c5d0 100644
--- a/libraries/lua-lpeg/lua-lpeg.SlackBuild
+++ b/libraries/lua-lpeg/lua-lpeg.SlackBuild
@@ -2,7 +2,7 @@
# SlackBuild script for lua-lpeg
-# Copyright 2014 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2014-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -57,20 +57,18 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || tar xvf $CWD/v$VERSION.tar.?z*
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
cd $SRCNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
make
-
-# Manual install
-install -m 0755 -D lpeg.so $PKG/usr/lib$LIBDIRSUFFIX/lua/5.1/lpeg.so
-install -m 0644 -D re.lua $PKG/usr/share/lua/5.1/re.lua
+install -m 0755 -D lpeg.so $PKG/$(pkg-config --variable INSTALL_CMOD lua)/lpeg.so
+install -m 0644 -D re.lua $PKG/$(pkg-config --variable INSTALL_LMOD lua)/re.lua
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true