The Birdfont Source Code


All Repositories / birdfont.git / commit – RSS feed

Add Debian multiarch directory to install script

These changes was commited to the Birdfont repository Thu, 25 Sep 2014 14:43:23 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
author Johan Mattsson <johan.mattsson.m@gmail.com>
Thu, 25 Sep 2014 14:43:23 +0000 (16:43 +0200)
committer Johan Mattsson <johan.mattsson.m@gmail.com>
Thu, 25 Sep 2014 14:43:23 +0000 (16:43 +0200)
commit 68173e69cfb4b1dd3fc2ca6df0909d372f10aab5
tree e8f0a02c01b79296aba67f321d1c4cf7fae2c217
parent 0de0a5759db39440d51b90cc08f82da88abb03c6
Add Debian multiarch directory to install script

install.py
--- a/install.py +++ b/install.py @@ -102,13 +102,19 @@ #library if not options.libdir: - p = platform.machine() - if p == 'i386' or p == 's390' or p == 'ppc' or p == 'armv7hl': - libdir = '/lib' - elif p == 'x86_64' or p == 's390x' or p == 'ppc64': - libdir = '/lib64' - else: - libdir = '/lib' + + if platform.dist()[0] == 'Ubuntu': + process = subprocess.Popen(['dpkg-architecture', '-qDEB_HOST_MULTIARCH'], stdout=subprocess.PIPE) + out, err = process.communicate() + libdir = '/lib/' + out.rstrip ('\n') + else: + p = platform.machine() + if p == 'i386' or p == 's390' or p == 'ppc' or p == 'armv7hl': + libdir = '/lib' + elif p == 'x86_64' or p == 's390x' or p == 'ppc64': + libdir = '/lib64' + else: + libdir = '/lib' else: libdir = options.libdir