Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic

3 files changed, 6 insertions, 6 deletions

diff --git a/platform/osx/waf b/platform/osx/waf
index 7423eb973..dda678542 100755
--- a/platform/osx/waf
+++ b/platform/osx/waf
@@ -2,10 +2,10 @@
 
 set -e
 
-ENV=/Users/carl/Environments/osx/10.8
-DEPS=/Users/carl/cdist
+ENV=/Users/carl/Environments/osx/64
+DEPS=/Users/carl/cdist/64
 
-export PKG_CONFIG_PATH=$DEPS/lib/pkgconfig:$ENV/lib/pkgconfig
+export PKG_CONFIG_PATH=$DEPS/lib/pkgconfig:$ENV/lib/pkgconfig:/usr/lib/pkgconfig
 export LINKFLAGS="-L$ENV/lib"
 export CXXFLAGS="-I$ENV/include"
 export PATH=$PATH:$ENV/bin
diff --git a/run/makedcp-osx b/run/makedcp-osx
index 1b95ecc5d..03756f524 100755
--- a/run/makedcp-osx
+++ b/run/makedcp-osx
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:build/src/lib:build/src:/Users/carl/Environments/osx/10.8/lib
+export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:build/src/lib:build/src:/Users/carl/Environments/osx/64/lib
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args build/src/tools/makedcp "$@"
diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 86146c1b1..86b657432 100644
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -22,7 +22,7 @@
 #include "cross.h"
 #include "compose.hpp"
 #include "log.h"
-#ifdef DVDOMATIC_POSIX
+#ifdef DVDOMATIC_LINUX
 #include <unistd.h>
 #include <mntent.h>
 #endif
@@ -165,7 +165,7 @@ mount_info ()
 {
 	list<pair<string, string> > m;
 	
-#ifdef DVDOMATIC_POSIX	
+#ifdef DVDOMATIC_LINUX
 	FILE* f = setmntent ("/etc/mtab", "r");
 	if (!f) {
 		return m;