From b5fedae3156b7d041ae1bc3b0bb67c0b9ebf40fa Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Sat, 16 Jul 2016 22:50:53 +0200
Subject: [PATCH] Add mandir and docdir

---
 astronaut/astronaut                       |  4 +++-
 astronaut/astronautpkg                    |  3 ++-
 satellites/functions/compile/configure.sh |  2 ++
 satellites/lua.sat                        | 16 ++++++++++++----
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/astronaut/astronaut b/astronaut/astronaut
index 921572b..cd63fe2 100755
--- a/astronaut/astronaut
+++ b/astronaut/astronaut
@@ -21,6 +21,8 @@ dir_bindir='bin'
 dir_sbindir='sbin'
 dir_libdir='lib'
 dir_libexecdir='lib'
+dir_mandir='share/man'
+dir_docdir='share/doc'
 
 # Default commands
 cmd_download='curl -# -L -o {dst} {src}'  # Command to execute to download files
@@ -75,7 +77,7 @@ Usage: $0 [-sbipr <dir>] [-Id] [-o <options>] <satellite>
 -v   Only build vcs package if any updates have been made to it
 -o   Set package options (comma-separated)
 
-Tips:$([ "$(basename "$0")" = "astronaut" ] && printf "\n- Use \`head -n 43 $0 > astronaut.conf.example\` to generate a default configuration file.")
+Tips:$([ "$(basename "$0")" = "astronaut" ] && printf "\n- Use \`head -n 45 $0 > astronaut.conf.example\` to generate a default configuration file.")
 - Keep in mind that when specifying options on the command line in a string, the first always takes priority.
     For example, in \"opt,someotheropt,!opt\", opt is enabled, due to it being the first occurrence.
 - If you have set \$dir_satellites in the config, you can omit the .sat suffix.
diff --git a/astronaut/astronautpkg b/astronaut/astronautpkg
index a348a70..fb6b9d0 100755
--- a/astronaut/astronautpkg
+++ b/astronaut/astronautpkg
@@ -22,5 +22,6 @@ _nuke_dir_install=true
 # _dir_pkgtools should be set from a configuration file (e.g. ~/.astronaut.conf), and points to wherever you want your packages to be placed.
 [ "$dir_wrapper_pkgtools" ] && mkdir -p "$dir_wrapper_pkgtools" || dir_wrapper_pkgtools="$_topdir"
 cd "$dir_install"
-[ -d usr/share/man ] && gzip -r usr/share/man
+[ -d usr/share/man ] && gzip -9 -r usr/share/man
+[ -d usr/man ] && gzip -9 -r usr/man
 PATH=$PATH:/sbin "$_fakeroot" makepkg -l y -c n "$dir_wrapper_pkgtools/$name-$version-$(uname -m)-astro.tgz"
diff --git a/satellites/functions/compile/configure.sh b/satellites/functions/compile/configure.sh
index 0d803d4..7be9986 100644
--- a/satellites/functions/compile/configure.sh
+++ b/satellites/functions/compile/configure.sh
@@ -5,6 +5,8 @@ compile_configure() {
         --sbindir="$dir_prefix/$dir_sbindir" \
         --libdir="$dir_prefix/$dir_libdir" \
         --libexecdir="$dir_prefix/$dir_libexecdir" \
+        --mandir="$dir_prefix/$dir_mandir" \
+        --docdir="$dir_prefix/$dir_docdir" \
         --sysconfdir=/etc $@
     make
     make DESTDIR="$dir_install/" install
diff --git a/satellites/lua.sat b/satellites/lua.sat
index c863602..cd695d9 100644
--- a/satellites/lua.sat
+++ b/satellites/lua.sat
@@ -1,5 +1,6 @@
 name=lua
-version=5.3.3
+majver=5.3
+version=$majver.3
 update_url="http://www.lua.org/download.html"
 
 dlextract "http://www.lua.org/ftp/$name-$version.tar.gz" \
@@ -7,8 +8,15 @@ dlextract "http://www.lua.org/ftp/$name-$version.tar.gz" \
 header_end
 
 cd "$name-$version"
-make MYLIBS="-lncurses" MYCFLAGS="$CFLAGS" linux
-option !no_check make test
-make INSTALL_TOP="$dir_install/$dir_prefix" install
+make linux \
+    MYLIBS="-lncurses" \
+    MYCFLAGS="$CFLAGS"
+
+make install \
+    INSTALL_TOP="$dir_install/$dir_prefix" \
+    INSTALL_BIN="$dir_install/$dir_prefix/$dir_bindir" \
+    INSTALL_LIB="$dir_install/$dir_prefix/$dir_libdir" \
+    INSTALL_MAN="$dir_install/$dir_prefix/$dir_mandir" \
+    INSTALL_CMOD="$dir_install/$dir_prefix/$dir_libdir/$majver"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh et: