1 files changed, 12 insertions, 5 deletions
diff --git a/network/mod_geoip2/mod_geoip2.SlackBuild b/network/mod_geoip2/mod_geoip2.SlackBuild
index 937a9c3fb9..fb2e98ecf1 100644
--- a/network/mod_geoip2/mod_geoip2.SlackBuild
+++ b/network/mod_geoip2/mod_geoip2.SlackBuild
@@ -17,10 +17,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e # exit on most errors
@@ -35,13 +38,17 @@ chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
 
 # Create target dir
-mkdir -p $PKG/usr/lib/httpd/modules
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/httpd/modules
 
 # Compile module as DSO (dynmically shared object)
-CFLAGS="$SLACKFLAGS" apxs -L/usr/lib -I/usr/include -lGeoIP -c mod_geoip.c
+CFLAGS="$SLACKFLAGS" apxs -L/usr/lib${LIBDIRSUFFIX} -I/usr/include -lGeoIP -c mod_geoip.c
 
 # copy into place
-cp -v .libs/mod_geoip.so $PKG/usr/lib/httpd/modules
+cp -v .libs/mod_geoip.so $PKG/usr/lib${LIBDIRSUFFIX}/httpd/modules
+
+mkdir -p $PKG/etc/httpd
+sed "s%@baselibdir@%lib${LIBDIRSUFFIX}%" $CWD/mod_geoip.conf > \
+  $PKG/etc/httpd/mod_geoip.conf.new
 
 find $PKG -type f | xargs file | grep -e "executable" -e "shared object" | \
   grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -49,11 +56,11 @@ find $PKG -type f | xargs file | grep -e "executable" -e "shared object" | \
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a Changes INSTALL README README.php $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}