3 files changed, 17 insertions, 4 deletions
diff --git a/network/mod_perl/mod_perl.SlackBuild b/network/mod_perl/mod_perl.SlackBuild
index 78289a9369..911fc7c824 100644
--- a/network/mod_perl/mod_perl.SlackBuild
+++ b/network/mod_perl/mod_perl.SlackBuild
@@ -33,6 +33,14 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i486" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+fi
+  
 set -e
 
 rm -rf $PKG
@@ -49,7 +57,8 @@ make
 make install DESTDIR=$PKG
 
 mkdir -p $PKG/etc/httpd
-cat $CWD/mod_perl.conf > $PKG/etc/httpd/mod_perl.conf.example
+sed "s%@baselibdir@%lib${LIBDIRSUFFIX}%g" $CWD/mod_perl.conf > \
+  $PKG/etc/httpd/mod_perl.conf.example
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a Changes INSTALL LICENSE README* RELEASE STATUS \
@@ -69,7 +78,9 @@ rm -rf $PKG/usr/share
   -o -name "*.bs" \
   | xargs rm -f
   # Remove empty directory
-  rmdir --parents $PKG/usr/lib/perl5/5.10.0/i486-linux-thread-multi 2>/dev/null || true
+  eval $(perl '-V:archlib')
+  eval $(perl '-V:vendorlib')
+  rmdir --parents $PKG/$archlib $PKG/$vendorlib 2> /dev/null || true
 )
 
 mkdir -p $PKG/install
@@ -77,4 +88,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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}
diff --git a/network/mod_perl/mod_perl.conf b/network/mod_perl/mod_perl.conf
index 8b33e560c1..1705c83e18 100644
--- a/network/mod_perl/mod_perl.conf
+++ b/network/mod_perl/mod_perl.conf
@@ -3,7 +3,7 @@
 #
 
 # Load the Perl module:
-LoadModule perl_module lib/httpd/modules/mod_perl.so
+LoadModule perl_module @baselibdir@/httpd/modules/mod_perl.so
 
 # Define the files mod-perl's responsible for
 AddHandler perl-script pl
diff --git a/network/mod_perl/mod_perl.info b/network/mod_perl/mod_perl.info
index 0ad9ac2f0c..de236f5701 100644
--- a/network/mod_perl/mod_perl.info
+++ b/network/mod_perl/mod_perl.info
@@ -2,7 +2,9 @@ PRGNAM="mod_perl"
 VERSION="2.0.4"
 HOMEPAGE="http://perl.apache.org/"
 DOWNLOAD="http://perl.apache.org/dist/mod_perl-2.0.4.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="1a05625ae6843085f985f5da8214502a"
+MD5SUM_x86_64=""
 MAINTAINER="ppr:kut"
 EMAIL="HMWiesinger@gmx.at"
 APPROVED="rworkman"