Build python2.7 with required support modules right in to the package

1 files changed, 170 insertions, 146 deletions

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index ad40f04d..1f539be0 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -28,7 +28,9 @@
 # For:        calibre
 # Descr:      e-book library management application
 # URL:        http://calibre-ebook.com/
-# Needs:      BeautifulSoup, dnspython, podofo, pysetuptools, python-cssutils,
+# Needs:      icu4c, podofo;
+#             And if your system already has python2.7, you will also need:
+#             BeautifulSoup, dnspython, pysetuptools, python-cssutils,
 #             python-imaging, python-lxml, python-dateutil, python-mechanize 
 # Changelog:  
 # 0.7.20-1:   25/Sep/2010 by Eric Hameleers <alien@slackware.com>
@@ -38,9 +40,11 @@
 # 0.8.3-1:    02/jun/2011 by Eric Hameleers <alien@slackware.com>
 #             * Update. Optionally, include the required python 2.7.x plus
 #               additional modules in the package.
+# 0.8.4-1:    05/jun/2011 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
 # Run 'sh calibre.SlackBuild' to build a Slackware package.
-# The package (.tgz) and .txt file as well as build logs are created in /tmp .
+# The package (.txz) and .txt file as well as build logs are created in /tmp .
 # Install it using 'installpkg'. 
 #
 # -----------------------------------------------------------------------------
@@ -48,7 +52,7 @@
 # Set initial variables:
 
 PRGNAM=calibre
-VERSION=${VERSION:-0.8.3}
+VERSION=${VERSION:-0.8.4}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
@@ -235,41 +239,46 @@ chmod -R u+w,go+r-w,a+X-s .
 echo Building ...
 
 #
+# What follows is a series of subroutines for building all the parts:
+#
+
+#
 # Build python 2.7:
 #
 make_python() {
 
-echo -e "\n**  python  **\n"
+  echo -e "\n**  python  **\n"
 
-cd $TMP/tmp-$PRGNAM/Python-${INT_PYTHON}
+  cd $TMP/tmp-$PRGNAM/Python-${INT_PYTHON}
 
-zcat $PATCHDIR/python.readline.set_pre_input_hook.diff.gz | patch -p1 --verbose
+  zcat $PATCHDIR/python.readline.set_pre_input_hook.diff.gz | \
+    patch -p1 --verbose
 
-# We are going to install python inside the calibre package. This requires some
-# changes to the standard build:
-# Creating the 'lib' directory below is needed! We are going to use rpath
-# so that we can run python from this non-standard path:
-mkdir -p /usr/lib${LIBDIRSUFFIX}/calibre/lib
+  # We are going to install python inside the calibre package.
+  # This requires some changes to the standard build:
+  # Creating the 'lib' directory below is needed! We are going to use rpath
+  # so that we can run python from this non-standard path:
+  mkdir -p /usr/lib${LIBDIRSUFFIX}/calibre/lib
 
-LDFLAGS="-Wl,-rpath /usr/lib${LIBDIRSUFFIX}/calibre/lib" \
-./configure \
-  --prefix=/usr/lib${LIBDIRSUFFIX}/calibre \
-  --bindir=/usr/lib${LIBDIRSUFFIX}/calibre \
-  --with-threads \
-  --enable-ipv6 \
-  --enable-shared \
-  --build=$ARCH-slackware-linux \
-  2>&1 | tee $OUTPUT/configure-${PRGNAM}_python.log
+  LDFLAGS="-Wl,-rpath /usr/lib${LIBDIRSUFFIX}/calibre/lib" \
+  ./configure \
+    --prefix=/usr/lib${LIBDIRSUFFIX}/calibre \
+    --bindir=/usr/lib${LIBDIRSUFFIX}/calibre \
+    --with-threads \
+    --enable-ipv6 \
+    --enable-shared \
+    --build=$ARCH-slackware-linux \
+    2>&1 | tee $OUTPUT/configure-${PRGNAM}_python.log
 
-make $NUMJOBS || make 2>&1 | tee $OUTPUT/make-${PRGNAM}_python.log
-make install DESTDIR=$PKG 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_python.log
+  make $NUMJOBS || make 2>&1 | tee $OUTPUT/make-${PRGNAM}_python.log
+  make install DESTDIR=$PKG 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_python.log
 
-# No need for man pages now:
-rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/calibre/share/man
+  # No need for man pages now:
+  rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/calibre/share/man
 
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/python
-cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION/python || true
+  # Add documentation:
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/python
+  cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION/python || true
 
 } # End of make_python
 
@@ -278,16 +287,17 @@ cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION/python || true
 #
 make_setuptools() {
 
-echo -e "\n**  setuptools  **\n"
+  echo -e "\n**  setuptools  **\n"
 
-cd $TMP/tmp-$PRGNAM/setuptools-${INT_SETUPTOOLS}
+  cd $TMP/tmp-$PRGNAM/setuptools-${INT_SETUPTOOLS}
 
-# Compile and install
-python setup.py install --root=$PKG 2>&1 | tee $OUTPUT/make-${PRGNAM}_setuptools.log
+  # Compile and install
+  python setup.py install --root=$PKG \
+    2>&1 | tee $OUTPUT/make-${PRGNAM}_setuptools.log
 
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/setuptools
-cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION/setuptools || true
+  # Add documentation:
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/setuptools
+  cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION/setuptools || true
 
 } # End make_setuptools
 
@@ -296,12 +306,13 @@ cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION/setuptools || true
 #
 make_BeautifulSoup() {
 
-echo -e "\n**  BeautifulSoup  **\n"
+  echo -e "\n**  BeautifulSoup  **\n"
 
-cd $TMP/tmp-$PRGNAM/BeautifulSoup-${INT_BEAUTIFULSOUP}
+  cd $TMP/tmp-$PRGNAM/BeautifulSoup-${INT_BEAUTIFULSOUP}
 
-# Compile and install
-python setup.py install --root=$PKG 2>&1 | tee $OUTPUT/make-${PRGNAM}_BeautifulSoup.log
+  # Compile and install
+  python setup.py install --root=$PKG \
+    2>&1 | tee $OUTPUT/make-${PRGNAM}_BeautifulSoup.log
 
 } # End make_BeautifulSoup
 
@@ -310,16 +321,18 @@ python setup.py install --root=$PKG 2>&1 | tee $OUTPUT/make-${PRGNAM}_BeautifulS
 #
 make_dnspython() {
 
-echo -e "\n**  dnspython  **\n"
+  echo -e "\n**  dnspython  **\n"
 
-cd $TMP/tmp-$PRGNAM/dnspython-${INT_DNSPYTHON}
+  cd $TMP/tmp-$PRGNAM/dnspython-${INT_DNSPYTHON}
 
-# Compile and install
-python setup.py install --root=$PKG 2>&1 | tee $OUTPUT/make-${PRGNAM}_dnspython.log
+  # Compile and install
+  python setup.py install --root=$PKG \
+    2>&1 | tee $OUTPUT/make-${PRGNAM}_dnspython.log
 
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/dnspython
-cp -a ChangeLog LICENSE README TODO $PKG/usr/doc/$PRGNAM-$VERSION/dnspython || true
+  # Add documentation:
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/dnspython
+  cp -a ChangeLog LICENSE README TODO \
+    $PKG/usr/doc/$PRGNAM-$VERSION/dnspython || true
 
 } # End make_dnspython
 
@@ -328,19 +341,21 @@ cp -a ChangeLog LICENSE README TODO $PKG/usr/doc/$PRGNAM-$VERSION/dnspython || t
 #
 make_cssutils() {
 
-echo -e "\n**  cssutils  **\n"
+  echo -e "\n**  cssutils  **\n"
 
-cd $TMP/tmp-$PRGNAM/cssutils-${INT_CSSUTILS}
+  cd $TMP/tmp-$PRGNAM/cssutils-${INT_CSSUTILS}
 
-# The source is infested with DOS files:
-sed -i -e 's/\r//' $( find . -type f -exec file "{}" ";" | grep CRLF | cut -f1 -d: )
+  # The source is infested with DOS files:
+  sed -i -e 's/\r//' $( find . -type f -exec file "{}" ";" | \
+    grep CRLF | cut -f1 -d: )
 
-# Compile and install
-python setup.py install --root=$PKG 2>&1 | tee $OUTPUT/make-${PRGNAM}_cssutils.log
+  # Compile and install
+  python setup.py install --root=$PKG \
+    2>&1 | tee $OUTPUT/make-${PRGNAM}_cssutils.log
 
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/cssutils
-cp -a COPYING* *.txt $PKG/usr/doc/$PRGNAM-$VERSION/cssutils || true
+  # Add documentation:
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/cssutils
+  cp -a COPYING* *.txt $PKG/usr/doc/$PRGNAM-$VERSION/cssutils || true
 
 } # End make_cssutils
 
@@ -349,16 +364,17 @@ cp -a COPYING* *.txt $PKG/usr/doc/$PRGNAM-$VERSION/cssutils || true
 #
 make_dateutil() {
 
-echo -e "\n**  dateutil  **\n"
+  echo -e "\n**  dateutil  **\n"
 
-cd $TMP/tmp-$PRGNAM/python-dateutil-${INT_DATEUTIL}
+  cd $TMP/tmp-$PRGNAM/python-dateutil-${INT_DATEUTIL}
 
-# Compile and install
-python setup.py install --root=$PKG 2>&1 | tee $OUTPUT/make-${PRGNAM}_dateutil.log
+  # Compile and install
+  python setup.py install --root=$PKG \
+    2>&1 | tee $OUTPUT/make-${PRGNAM}_dateutil.log
 
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/dateutil
-cp -a LICENSE NEWS README $PKG/usr/doc/$PRGNAM-$VERSION/dateutil || true
+  # Add documentation:
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/dateutil
+  cp -a LICENSE NEWS README $PKG/usr/doc/$PRGNAM-$VERSION/dateutil || true
 
 } # End make_dateutil
 
@@ -367,46 +383,42 @@ cp -a LICENSE NEWS README $PKG/usr/doc/$PRGNAM-$VERSION/dateutil || true
 #
 make_imaging() {
 
-echo -e "\n**  imaging  **\n"
+  echo -e "\n**  imaging  **\n"
 
-cd $TMP/tmp-$PRGNAM/Imaging-${INT_IMAGING}
+  cd $TMP/tmp-$PRGNAM/Imaging-${INT_IMAGING}
 
-# Installation path for headers:
-PYTHONINC=$( python -c 'from distutils.sysconfig import *;print get_python_inc()' )
+  # Installation path for headers:
+  PYTHONINC=$( python -c 'from distutils.sysconfig import *;print get_python_inc()' )
 
-# Not needed in our internal build:
-## Fix library path on x86_64 :
-#cat $PATCHDIR/python-imaging.lib64.diff | patch -p1 --verbose \
-#  2>&1 | tee $OUTPUT/patch-$PRGNAM.log
+  # Support transparent gifs:
+  cat $PATCHDIR/python-imaging.giftrans.diff | patch -p1 --verbose \
+    2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
 
-# Support transparent gifs:
-cat $PATCHDIR/python-imaging.giftrans.diff | patch -p1 --verbose \
-  2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
+  # Fix the python path for Scripts/*.py :
+  for script in Scripts/*.py ; do
+    sed -i -e "s#/usr/local/bin/python#python#"  $script
+    chmod 755 $script
+  done
 
-# Fix the python path for Scripts/*.py :
-for script in Scripts/*.py ; do
-  sed -i -e "s#/usr/local/bin/python#python#"  $script
-  chmod 755 $script
-done
+  # Compile and install
+  CFLAGS="$SLKCFLAGS" \
+  python setup.py build 2>&1 | tee $OUTPUT/make-${PRGNAM}_imaging.log
+  ( cd Sane
+    CFLAGS="$SLKCFLAGS" python setup.py build \
+      2>&1 | tee -a $OUTPUT/make-${PRGNAM}_imaging.log
+  )
 
-# Compile and install
-CFLAGS="$SLKCFLAGS" python setup.py build 2>&1 | tee $OUTPUT/make-${PRGNAM}_imaging.log
-( cd Sane
-  CFLAGS="$SLKCFLAGS" python setup.py build \
-    2>&1 | tee -a $OUTPUT/make-${PRGNAM}_imaging.log
-)
-
-# Install all of this:
-mkdir -p $PKG/${PYTHONINC}/Imaging
-install -m 644 libImaging/*.h $PKG/${PYTHONINC}/Imaging
-python setup.py install --skip-build --root $PKG
-( cd Sane
+  # Install all of this:
+  mkdir -p $PKG/${PYTHONINC}/Imaging
+  install -m 644 libImaging/*.h $PKG/${PYTHONINC}/Imaging
   python setup.py install --skip-build --root $PKG
-)
+  ( cd Sane
+    python setup.py install --skip-build --root $PKG
+  )
 
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/imaging
-cp -a README CHANGES $PKG/usr/doc/$PRGNAM-$VERSION/imaging || true
+  # Add documentation:
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/imaging
+  cp -a README CHANGES $PKG/usr/doc/$PRGNAM-$VERSION/imaging || true
 
 } # End make_imaging
 
@@ -415,16 +427,17 @@ cp -a README CHANGES $PKG/usr/doc/$PRGNAM-$VERSION/imaging || true
 #
 make_lxml() {
 
-echo -e "\n**  lxml  **\n"
+  echo -e "\n**  lxml  **\n"
 
-cd $TMP/tmp-$PRGNAM/lxml-${INT_LXML}
+  cd $TMP/tmp-$PRGNAM/lxml-${INT_LXML}
 
-# Compile and install
-python setup.py install --root=$PKG 2>&1 | tee $OUTPUT/make-${PRGNAM}_lxml.log
+  # Compile and install
+  python setup.py install --root=$PKG \
+    2>&1 | tee $OUTPUT/make-${PRGNAM}_lxml.log
 
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/lxml
-cp -a *.txt doc/licenses $PKG/usr/doc/$PRGNAM-$VERSION/lxml || true
+  # Add documentation:
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/lxml
+  cp -a *.txt doc/licenses $PKG/usr/doc/$PRGNAM-$VERSION/lxml || true
 
 } # End make_lxml
 
@@ -433,17 +446,18 @@ cp -a *.txt doc/licenses $PKG/usr/doc/$PRGNAM-$VERSION/lxml || true
 #
 make_mechanize() {
 
-echo -e "\n**  mechanize  **\n"
+  echo -e "\n**  mechanize  **\n"
 
-cd $TMP/tmp-$PRGNAM/mechanize-${INT_MECHANIZE}
+  cd $TMP/tmp-$PRGNAM/mechanize-${INT_MECHANIZE}
 
-# Compile and install
-export CFLAGS="$SLKCFLAGS"
-python setup.py install --root=$PKG 2>&1 | tee $OUTPUT/make-${PRGNAM}_mechanize.log
+  # Compile and install
+  export CFLAGS="$SLKCFLAGS"
+  python setup.py install --root=$PKG \
+    2>&1 | tee $OUTPUT/make-${PRGNAM}_mechanize.log
 
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/mechanize
-cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION/mechanize || true
+  # Add documentation:
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/mechanize
+  cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION/mechanize || true
 
 } # End make_mechanize
 
@@ -452,21 +466,21 @@ cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION/mechanize || true
 #
 make_sip() {
 
-echo -e "\n**  sip  **\n"
+  echo -e "\n**  sip  **\n"
 
-cd $TMP/tmp-$PRGNAM/sip-${INT_SIP}
+  cd $TMP/tmp-$PRGNAM/sip-${INT_SIP}
 
-# Compile and install:
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-  python configure.py 2>&1 | tee $OUTPUT/configure-${PRGNAM}_sip.log
-make $NUMJOBS || make 2>&1 | tee $OUTPUT/make-${PRGNAM}_sip.log
-make install DESTDIR=$PKG 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_sip.log
+  # Compile and install:
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+    python configure.py 2>&1 | tee $OUTPUT/configure-${PRGNAM}_sip.log
+  make $NUMJOBS || make 2>&1 | tee $OUTPUT/make-${PRGNAM}_sip.log
+  make install DESTDIR=$PKG 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_sip.log
 
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/sip
-cp -a LICENSE COPYING* NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION/sip || true
+  # Add documentation:
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/sip
+  cp -a LICENSE COPYING* NEWS README TODO \
+    $PKG/usr/doc/$PRGNAM-$VERSION/sip || true
 
 } # End make_sip
 
@@ -475,34 +489,34 @@ cp -a LICENSE COPYING* NEWS README TODO \
 #
 make_pyqt() {
 
-echo -e "\n**  pyqt  **\n"
+  echo -e "\n**  pyqt  **\n"
 
-cd $TMP/tmp-$PRGNAM/PyQt-x11-gpl-${INT_PYQT}
+  cd $TMP/tmp-$PRGNAM/PyQt-x11-gpl-${INT_PYQT}
 
-# Fix phonon detection:
-zcat $SRCDIR/patches/PyQt.phonon.diff.gz | patch -p1 --verbose
+  # Fix phonon detection:
+  zcat $SRCDIR/patches/PyQt.phonon.diff.gz | patch -p1 --verbose
 
-# Compile and install
-# This avoids compiling a version number into KDE's .la files:
-export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt
+  # Compile and install
+  # This avoids compiling a version number into KDE's .la files:
+  export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt
 
-export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
+  export CFLAGS="$SLKCFLAGS"
+  export CXXFLAGS="$SLKCFLAGS"
 
-python configure.py --confirm-license --verbose \
-  2>&1 | tee $OUTPUT/configure-${PRGNAM}_pyqt.log
-make $NUMJOBS || make \
-  2>&1 | tee $OUTPUT/make-${PRGNAM}_pyqt.log
-make install DESTDIR=$PKG \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_pyqt.log
+  python configure.py --confirm-license --verbose \
+    2>&1 | tee $OUTPUT/configure-${PRGNAM}_pyqt.log
+  make $NUMJOBS || make \
+    2>&1 | tee $OUTPUT/make-${PRGNAM}_pyqt.log
+  make install DESTDIR=$PKG \
+    2>&1 | tee -a $OUTPUT/make-${PRGNAM}_pyqt.log
 
-# ... but remove ugly bits that threaten to overwrite a system file:
-rm -r $PKG/usr/lib${LIBDIRSUFFIX}/qt
+  # ... but remove ugly bits that threaten to overwrite a system file:
+  rm -r $PKG/usr/lib${LIBDIRSUFFIX}/qt
 
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/pyqt
-cp -a GPL_EXCEPTION*.TXT LICENSE.* NEWS OPENSOURCE-NOTICE.TXT README THANKS \
-  $PKG/usr/doc/$PRGNAM-$VERSION/pyqt || true
+  # Add documentation:
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/pyqt
+  cp -a GPL_EXCEPTION*.TXT LICENSE.* NEWS OPENSOURCE-NOTICE.TXT README THANKS \
+    $PKG/usr/doc/$PRGNAM-$VERSION/pyqt || true
 
 } # End make_pyqt
 
@@ -515,6 +529,9 @@ make_calibre () {
 
   cd $TMP/tmp-$PRGNAM/${PRGNAM}
 
+  # See if we picked up any linker flags for python:
+  LDFLAGS=${LDFLAGS:-""}
+
   # Place where we have to install stuff:
   PYTHONLIB=$( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()" )
 
@@ -536,7 +553,7 @@ make_calibre () {
   cat $PATCHDIR/calibre.manpages.diff | patch -p1 --verbose \
     2>&1 | tee $OUTPUT/patch-$PRGNAM.log
 
-  OVERRIDE_LDFLAGS="-Wl,-rpath /usr/lib${LIBDIRSUFFIX}/calibre/lib -L/usr/lib${LIBDIRSUFFIX}/calibre/lib" \
+  OVERRIDE_LDFLAGS="$LDFLAGS $SLKLDFLAGS" \
   OVERRIDE_CFLAGS="$SLKCFLAGS" \
   python setup.py build \
     2>&1 | tee $OUTPUT/make-${PRGNAM}.log
@@ -603,8 +620,15 @@ make_calibre () {
 
 } # End of make_calibre
 
+#
+# End of the subroutines.
+#
+
 # Compilation of the software:
 if [ "$BUILD_PYTHON" = "YES" ]; then
+
+  # No python2.7 was found on the computer so we need to build it ourself.
+
   # After each part is built we will sync to here because in the end, calibre
   # will wipe the origin and we will have to sync it all back:
   mkdir /usr/lib${LIBDIRSUFFIX}/calibre
@@ -615,7 +639,7 @@ if [ "$BUILD_PYTHON" = "YES" ]; then
   # Ensure that our non-standard python2.7 is found and used:
   export PATH="/usr/lib${LIBDIRSUFFIX}/calibre:$PATH"
   export PKG_CONFIG_PATH="/usr/lib${LIBDIRSUFFIX}/calibre/lib/pkgconfig:$PKG_CONFIG_PATH"
-  export LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}/calibre/lib"
+  export LDFLAGS="-Wl,-rpath /usr/lib${LIBDIRSUFFIX}/calibre/lib -L/usr/lib${LIBDIRSUFFIX}/calibre/lib"
 
   make_setuptools
   rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
@@ -649,6 +673,7 @@ if [ "$BUILD_PYTHON" = "YES" ]; then
 
 fi
 
+# The main course - compile calibre:
 make_calibre
 
 if [ "$BUILD_PYTHON" = "YES" ]; then
@@ -675,7 +700,6 @@ if [ "$BUILD_PYTHON" = "YES" ]; then
   done
 
   # This is not needed in the package:
-  #rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/calibre/{bin,include,lib/pkgconfig,share}
   rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/calibre/{bin,lib/pkgconfig,share}
 
 fi
@@ -727,9 +751,9 @@ fi
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}.md5
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep