# HG changeset patch
# User samer
# Date 1326983138 0
# Node ID 193d582746e597ab327280369f7b3c3abecbab21
# Parent  460f6c74b33a98207c3a8dd5ba9c8d003d8d3ddf# Parent  9b16fbec2f332d13024a60fa07fa4078a0fb8ec7
Add CXX variable to select which C++ compiler to use, needed for Lion.

diff -r 460f6c74b33a -r 193d582746e5 Makefile
--- a/Makefile	Tue Jan 17 18:39:14 2012 +0000
+++ b/Makefile	Thu Jan 19 14:25:38 2012 +0000
@@ -21,10 +21,16 @@
 # install directories
 export INSTALL_LIB_TO=~/lib/prolog/x86_64
 export INSTALL_PL_TO=~/lib/prolog/source
+export INSTALL_ML_TO=~/lib/matlab
 
 # flags for install - BSD install seems to be different from GNU install
 export INSTALL_FLAGS='-bCS'
 
+# on Mac OS X Lion using MacPorts gcc 4.2, you need this to select
+# the correct C++ compiler. Leave CXX blank otherwise.
+export CXX=-c++ g++-apple-4.2
+#export CXX=
+
 VER=1.0
 # ---------------- end of configuration ---------------
 
@@ -37,6 +43,7 @@
 install: main
 	make -C cpp install
 	make -C prolog install
+	make -C matlab install
 
 tarball:
 	mkdirhier release
diff -r 460f6c74b33a -r 193d582746e5 cpp/Makefile
--- a/cpp/Makefile	Tue Jan 17 18:39:14 2012 +0000
+++ b/cpp/Makefile	Thu Jan 19 14:25:38 2012 +0000
@@ -4,8 +4,7 @@
 TARGET=plml.$(SO)
 INCML=$(MATLAB)/extern/include
 LIBML=$(MATLAB)/bin/$(MLARCH)
-PLLDFLAGS=-c++ g++-apple-4.2 $(INCLUDES) -I$(INCML) -Wall
-# use -c++ g++-4.2 on Snow Leopard
+PLLDFLAGS=$(CXX) $(INCLUDES) -I$(INCML) -Wall
 
 .SUFFIXES: .cpp .o .so .dylib