diff options
author | Eric Hameleers <alien@slackware.com> | 2015-05-27 15:20:16 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2015-05-27 15:20:16 +0000 |
commit | e378949e178647db9e071f0665a335f7af83a907 (patch) | |
tree | 0ecaff8c0f4ca07a5f150143404ad9dd7312c34b /calibre/build/calibre.SlackBuild | |
parent | 1c9964a0a0ad550ed9faa82ba16338d15698e376 (diff) | |
download | asb-e378949e178647db9e071f0665a335f7af83a907.tar.gz asb-e378949e178647db9e071f0665a335f7af83a907.tar.xz |
calibre: parametrize the calibre_pythondeps filename so I can distinguish between calibre 1.x and 2.x tarballs
Diffstat (limited to 'calibre/build/calibre.SlackBuild')
-rwxr-xr-x | calibre/build/calibre.SlackBuild | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild index bf45a995..cd053e64 100755 --- a/calibre/build/calibre.SlackBuild +++ b/calibre/build/calibre.SlackBuild @@ -1113,13 +1113,13 @@ make_calibre () { # Compilation of the software: if [ "$BUILD_PYTHON" = "YES" -o "$BUILD_PYTHONMODS" = "YES" -o "$BUILD_QT" = "YES" -o "$BUILD_MTP" = "YES" ]; then - if [ -f $SRCDIR/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then + if [ -f $SRCDIR/${PRGNAM}_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then # We unwrap the tarball of compiled python internal libraries instead of # having to build them - this saves a _lot_ of compile time: mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre ( cd $PKG/usr/lib${LIBDIRSUFFIX}/calibre echo "** Extracting dependencies tarball... **" - tar -jxf $SRCDIR/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 + tar -jxf $SRCDIR/${PRGNAM}_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 # We also need a copy in the filesystem root! rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre /usr/lib${LIBDIRSUFFIX}/ ) @@ -1139,7 +1139,7 @@ fi if [ "$BUILD_MTP" = "YES" ]; then # No sufficiently new libmtp was found so we need to supply it ourself. - if [ ! -f $SRCDIR/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then + if [ ! -f $SRCDIR/${PRGNAM}_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then # No tarball containing pre-compiled libraries was found. # We need to build libmptp ourself. @@ -1156,7 +1156,7 @@ fi if [ "$BUILD_QT" = "YES" ]; then # No sufficiently new Qt was found so we need to supply it ourself. - if [ ! -f $SRCDIR/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then + if [ ! -f $SRCDIR/${PRGNAM}_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then # No tarball containing pre-compiled libraries was found. # We need to build Qt ourself. @@ -1173,7 +1173,7 @@ fi if [ "$BUILD_PYTHON" = "YES" ]; then # No python2.7 was found on the computer so we need to supply it ourself. - if [ ! -f $SRCDIR/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then + if [ ! -f $SRCDIR/${PRGNAM}_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then # No tarball containing pre-compiled python libraries was found. # We need to build python2.7 ourself. @@ -1196,7 +1196,7 @@ fi if [ "$BUILD_PYTHONMODS" = "YES" ]; then # The python2.7 modules need to be compiled into the package: - if [ ! -f $SRCDIR/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then + if [ ! -f $SRCDIR/${PRGNAM}_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then # No tarball containing pre-compiled python libraries was found. # We need to build python2.7 modules ourself. @@ -1270,11 +1270,11 @@ if [ "$BUILD_PYTHON" = "YES" -o "$BUILD_PYTHONMODS" = "YES" -o "$BUILD_QT" = "YE # have to recompile them every time). # If you want to make use of this, then just copy the resulting tarball # into the same directory as this SlackBuild script: - if [ ! -f $SRCDIR/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then + if [ ! -f $SRCDIR/${PRGNAM}_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then ( cd $PKG/usr/lib${LIBDIRSUFFIX}/calibre - echo "** Creating dependencies tarball $OUTPUT/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2" + echo "** Creating dependencies tarball $OUTPUT/${PRGNAM}_pythondeps-${SLACKVER}-${ARCH}.tar.bz2" echo "** Move this file to $SRCDIR for future compilation speedups." - tar -jcf $OUTPUT/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 . + tar -jcf $OUTPUT/${PRGNAM}_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 . ) fi fi |