summaryrefslogtreecommitdiffstats
path: root/libreoffice
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2011-06-20 19:07:14 +0000
committer Eric Hameleers <alien@slackware.com>2011-06-20 19:07:14 +0000
commit7e7f003c5f0371345991e85f43cd7e4bbab229ce (patch)
treec346fc23030e80d7b79c67f4ac1c99c8582ad623 /libreoffice
parent18248939c00fa915cf508c8e079eba267950de51 (diff)
downloadasb-7e7f003c5f0371345991e85f43cd7e4bbab229ce.tar.gz
asb-7e7f003c5f0371345991e85f43cd7e4bbab229ce.tar.xz
Slackware.conf.in differetiates between 3.3.x and 3.4.x
Diffstat (limited to 'libreoffice')
-rwxr-xr-xlibreoffice/build/libreoffice33.SlackBuild4
1 files changed, 2 insertions, 2 deletions
diff --git a/libreoffice/build/libreoffice33.SlackBuild b/libreoffice/build/libreoffice33.SlackBuild
index a9aea754..86137878 100755
--- a/libreoffice/build/libreoffice33.SlackBuild
+++ b/libreoffice/build/libreoffice33.SlackBuild
@@ -684,7 +684,7 @@ export OOInstall="/usr/lib${LIBDIRSUFFIX}/libreoffice"
export OODESTDIR="$PKG"
# Substitute our Slackware-specific configuration:
-cat $SRCDIR/Slackware.conf.in | \
+cat $SRCDIR/Slackware.conf.in.33 | \
sed -e "s#@JAVA_HOME@#$JAVA_HOME#" \
-e "s#@BUILDVERSION@#${LOVER}$VERSION#" \
-e "s#@PACKAGER@#$PACKAGER#" \
@@ -941,7 +941,7 @@ EOT
mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION
cp -a $DOCS $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION || true
cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION/$PRGNAM.SlackBuild
-cat $SRCDIR/Slackware.conf.in > $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION/Slackware.conf.in
+cat $SRCDIR/Slackware.conf.in.33 > $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION/Slackware.conf.in
mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION/patches
cp $SRCDIR/*.patch $SRCDIR/*.diff $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION/patches/ || true
chown -R root:root $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION