Clone in a terminal:
Commit 037dcd2
Johan Mattsson - 2015-09-20T14:28:16+00:00
037dcd2c5c65a47a5aa075c6161b4244b487a1c7johan.mattsson.m@gmail.com

Merge pull request #7 from jasperla/openbsd Fixup OpenBSD support

Changed files (2)

Diff

diff --git a/dodo.py b/dodo.pyindex 60fbea4..4dfbb9c 100644--- a/dodo.py+++ b/dodo.py@@ -41,14 +41,14 @@ DOIT_CONFIG = {  if "kfreebsd" in sys.platform:     LIBBIRDGEMS_SO_VERSION=version.LIBBIRDGEMS_SO_VERSION-elif "bsd" in sys.platform:+elif "openbsd" in sys.platform:     LIBBIRDGEMS_SO_VERSION='${LIBbirdgems_VERSION}' else:     LIBBIRDGEMS_SO_VERSION=version.LIBBIRDGEMS_SO_VERSION  if "kfreebsd" in sys.platform:     SO_VERSION=version.SO_VERSION-elif "bsd" in sys.platform:+elif "openbsd" in sys.platform:     SO_VERSION='${LIBbirdfont_VERSION}' else:     SO_VERSION=version.SO_VERSIONdiff --git a/install.py b/install.pyindex 4ecbced..203a845 100755--- a/install.py+++ b/install.py@@ -140,7 +140,9 @@ if not options.libdir: else: 	libdir = options.libdir -if os.path.isfile ('build/bin/libbirdfont.so.' + version.SO_VERSION):+if "openbsd" in sys.platform:+        install ('build/bin/libbirdfont.so.' + '${LIBbirdfont_VERSION}', '/lib', 644)+elif os.path.isfile ('build/bin/libbirdfont.so.' + version.SO_VERSION): 	install ('build/bin/libbirdfont.so.' + version.SO_VERSION, libdir, 644) 	link (libdir, 'libbirdfont.so.' + version.SO_VERSION, ' libbirdfont.so.' + version.SO_VERSION_MAJOR) 	link (libdir, 'libbirdfont.so.' + version.SO_VERSION, ' libbirdfont.so')@@ -156,9 +158,8 @@ else: 	print ("Can't find libbirdfont.") 	exit (1) -if "bsd" in sys.platform:-        install ('build/libbirdfont.so.' + '${LIBbirdfont_VERSION}', '/lib', 644)-        install ('build/libbirdgems.so.' + '${LIBbirdgems_VERSION}', '/lib', 644)+if "openbsd" in sys.platform:+        install ('build/bin/libbirdgems.so.' + '${LIBbirdgems_VERSION}', '/lib', 644) elif os.path.isfile ('build/bin/libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION):         install ('build/bin/libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, libdir, 644)         link (libdir, 'libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, ' libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION_MAJOR)

Contact

Email: johan.mattsson.m@gmail.com
Mastodon: typo.social/@birdfont
GitHub: johanmattssonm
LinkedIn: johan-mattsson-2ab324112