summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Gysin2015-12-17 21:49:26 +0200
committerChristoph Gysin2015-12-17 21:49:26 +0200
commit81ce8a36e134679062996acd021ada2938e8d21b (patch)
tree7591b329e41881eebfd66d63eec326dcde5c83f9
parentb3f5b303943871de2d30c40984fe0691f9221665 (diff)
downloadaur-81ce8a36e134679062996acd021ada2938e8d21b.tar.gz
fix arch handling
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD20
2 files changed, 13 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 16e8d1e4399..cbc187ca5fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Dec 17 19:34:03 UTC 2015
+# Thu Dec 17 19:47:50 UTC 2015
pkgbase = samsung-unified-driver
pkgdesc = Unified Linux Driver for Samsung printers and scanners.
pkgver = 1.00.36
- pkgrel = 1
+ pkgrel = 2
url = http://www.samsung.com
arch = i686
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index b2ff37d1708..f351a402168 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=samsung-unified-driver
pkgver=1.00.36
-pkgrel=1
+pkgrel=2
pkgdesc="Unified Linux Driver for Samsung printers and scanners."
arch=(i686 x86_64)
@@ -18,10 +18,12 @@ sha512sums=('3f824b1af9dd4dd200a289832289ba44841fc85586322126ff44986d1e44a53fab1
'325d2e3e42bf74663ba0ac3aa0fc3ee70ef5a5197d03c069fac6bc0f8da0d9e12d50e4b59feacef3000eff5a85d3db7f66834809013b18b31532cfea252460ef')
package() {
- if [ "$arch" = "i686" ]; then
- arch=i386
+ local _arch
+
+ if [ "$CARCH" == "i686" ]; then
+ _arch=i386
else
- arch=$CARCH
+ _arch=$CARCH
fi
mkdir -p "$pkgdir"/etc/sane.d
@@ -33,17 +35,17 @@ package() {
echo xerox_mfp-smfp > "$pkgdir"/etc/sane.d/dll.d/smfp-scanner-fix
mkdir -p "$pkgdir"/usr/lib
- cp "$srcdir"/uld/$arch/libscmssc.so "$pkgdir"/usr/lib
+ cp "$srcdir"/uld/$_arch/libscmssc.so "$pkgdir"/usr/lib
mkdir -p "$pkgdir"/usr/lib/cups/backend
- cp "$srcdir"/uld/$arch/smfpnetdiscovery "$pkgdir"/usr/lib/cups/backend
+ cp "$srcdir"/uld/$_arch/smfpnetdiscovery "$pkgdir"/usr/lib/cups/backend
mkdir -p "$pkgdir"/usr/lib/cups/filter
- cp "$srcdir"/uld/$arch/pstosecps "$pkgdir"/usr/lib/cups/filter
- cp "$srcdir"/uld/$arch/rastertospl "$pkgdir"/usr/lib/cups/filter
+ cp "$srcdir"/uld/$_arch/pstosecps "$pkgdir"/usr/lib/cups/filter
+ cp "$srcdir"/uld/$_arch/rastertospl "$pkgdir"/usr/lib/cups/filter
mkdir -p "$pkgdir"/usr/lib/sane
- cp "$srcdir"/uld/$arch/libsane-smfp.so.1.0.1 "$pkgdir"/usr/lib/sane
+ cp "$srcdir"/uld/$_arch/libsane-smfp.so.1.0.1 "$pkgdir"/usr/lib/sane
ln -s libsane-smfp.so.1.0.1 "$pkgdir"/usr/lib/sane/libsane-smfp.so.1
ln -s libsane-smfp.so.1 "$pkgdir"/usr/lib/sane/libsane-smfp.so