summaryrefslogtreecommitdiff
path: root/python/gerbmerge
diff options
context:
space:
mode:
authordsomero <xgizzmo@slackbuilds.org>2012-09-16 12:21:44 -0400
committerdsomero <xgizzmo@slackbuilds.org>2012-09-16 19:43:00 -0400
commit2e306301770429a1175a72e466c3a4cf53235a89 (patch)
treed44e33a39552ecdd775d174d00faf5e5f563e013 /python/gerbmerge
parentd340f92381b08dbbe763a460707148d6d22b2344 (diff)
downloadslackbuilds-2e306301770429a1175a72e466c3a4cf53235a89.tar.gz
python/gerbmerge: Fixed python path
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'python/gerbmerge')
-rw-r--r--python/gerbmerge/fix-install-paths.patch2
-rw-r--r--python/gerbmerge/gerbmerge.SlackBuild8
2 files changed, 8 insertions, 2 deletions
diff --git a/python/gerbmerge/fix-install-paths.patch b/python/gerbmerge/fix-install-paths.patch
index dd6ea36f71..dbe20a3f57 100644
--- a/python/gerbmerge/fix-install-paths.patch
+++ b/python/gerbmerge/fix-install-paths.patch
@@ -6,7 +6,7 @@ diff -Naur gerbmerge-1.8old/setup.py gerbmerge-1.8new/setup.py
BinDir = '.'
else:
- DestLib = distutils.sysconfig.get_config_var('LIBPYTHON')
-+ DestLib = "/usr/lib/python2.6"
++ DestLib = "/usr/lib/python2.7"
DestDir = os.path.join(DestLib, 'gerbmerge')
BinFiles = ['misc/gerbmerge']
BinDir = distutils.sysconfig.get_config_var('BINDIR')
diff --git a/python/gerbmerge/gerbmerge.SlackBuild b/python/gerbmerge/gerbmerge.SlackBuild
index d3c89b1398..c4d085b556 100644
--- a/python/gerbmerge/gerbmerge.SlackBuild
+++ b/python/gerbmerge/gerbmerge.SlackBuild
@@ -22,6 +22,12 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
+if [ "$ARCH" = "x86_64" ]; then
+ LIBDIRSUFFIX="64"
+else
+ LIBDIRSUFFIX=""
+fi
+
set -e
rm -rf $PKG
@@ -31,7 +37,7 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
-patch -p1 < $CWD/fix-install-paths.patch
+sed s/lib/lib$LIBDIRSUFFIX/ $CWD/fix-install-paths.patch | patch -p1
chown -R root:root .
find . \