Merge remote-tracking branch 'origin/master' into p2

Conflicts: Makefile
perl11 · Mar 5, 2013 · 90fbf22 · 90fbf22
2 parents 98ebe10 + 87acf86
commit 90fbf22
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -164,7 +164,7 @@ core/vm.o core/vm.opic: core/vm-dis.c
 
 # the installed version assumes bin/potion loading from ../lib/libpotion (relocatable)
 # on darwin we generate a parallel p2/../lib to use @executable_path/../lib/libpotion
-ifdef APPLE
+ifeq (${APPLE},1)
 LIBHACK = ../lib/libpotion.dylib ../lib/libp2.dylib
 else
 LIBHACK =