From: Wolfram Schneider Date: Fri, 14 Nov 2014 12:53:22 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/irspy X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=commitdiff_plain;h=af62cf5634a1dd753f7031399a2a20549a140ecf;hp=89c045edbd3d09872a06cfe5e1eafbc17b6f4958 Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/irspy Conflicts: zebra/zebra.cfg --- diff --git a/zebra/zebra-test.cfg b/zebra/zebra-test.cfg index 864f6d5..d07e29b 100644 --- a/zebra/zebra-test.cfg +++ b/zebra/zebra-test.cfg @@ -1,13 +1,11 @@ # Where to look for config files -#profilePath: .:/usr/local/share/idzebra-2.0/tab:/usr/share/idzebra-2.0/tab -profilePath: .:/usr/share/idzebra-2.0/tab +profilePath: .:/usr/local/share/idzebra-2.0/tab:/usr/share/idzebra-2.0/tab:/opt/local/share/idzebra-2.0/tab:/usr/share/idzebra-2.0/tab # Where to look for loadable zebra modules. Both these path components # are necessary, since the former is used when installing from a Debian # package and the latter when installing from a CVS build. -modulePath: /usr/lib/idzebra-2.0/modules -#modulePath: /usr/local/lib/idzebra-2.0/modules +modulePath: /usr/local/lib/idzebra-2.0/modules:/opt/local/lib/idzebra-2.0/modules:/usr/lib/idzebra-2.0/modules # store records and record keys internally storeData: 1 diff --git a/zebra/zebra.cfg b/zebra/zebra.cfg index 0527644..7c7d482 100644 --- a/zebra/zebra.cfg +++ b/zebra/zebra.cfg @@ -5,7 +5,7 @@ profilePath: .:/usr/share/idzebra-2.0/tab:/opt/local/share/idzebra-2.0/tab:/usr/ # Where to look for loadable zebra modules. Both these path components # are necessary, since the former is used when installed from a Debian # package and the latter when installed from a Mac port. -modulePath: /usr/lib/idzebra-2.0/modules:/opt/local/lib/idzebra-2.0/modules:/usr/local/Cellar/zebra/2.0.59/lib/idzebra-2.0/modules +modulePath: /usr/local/lib/idzebra-2.0/modules:/opt/local/lib/idzebra-2.0/modules:/usr/lib/idzebra-2.0/modules # store records and record keys internally storeData: 1