The Birdfont Source Code


All Repositories / birdfont.git / commitdiff – RSS feed

Merge branch 'master' of github.com:johanmattssonm/birdfont

These changes was commited to the Birdfont repository Sun, 20 Sep 2015 14:30:58 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
[Sun, 20 Sep 2015 14:30:58 +0000]

Updated Files

dodo.py
install.py
diff --git a/dodo.py b/dodo.py
--- a/dodo.py +++ b/dodo.py @@ -41,14 +41,14 @@ 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_VERSION
--- a/install.py +++ b/install.py @@ -140,7 +140,9 @@ 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 @@ 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)