X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile;h=4827101c2fcc7da6a8e0c41e2ae783aa486f5d4e;hb=95d760554441dac36fb77011c0c875490f873d68;hp=f8b91df1ce719df6504aee1ef8f4a672e78ca040;hpb=5263df38c65ceaa4d399a7ab1ce32a8f9ef0d2fe;p=perl4caml.git

diff --git a/Makefile b/Makefile
index f8b91df..4827101 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,22 @@
 # Interface to Perl from OCaml.
 # Copyright (C) 2003 Merjis Ltd.
-# $Id: Makefile,v 1.30 2005-01-31 15:23:23 rich Exp $
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this library; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+# $Id: Makefile,v 1.33 2008-03-01 13:02:21 rich Exp $
 
 include Makefile.config
 
@@ -19,7 +35,10 @@ OCAMLOPTFLAGS := -w s $(OCAMLOPTINCS)
 PERLCFLAGS := $(shell perl -e 'use Config; print $$Config{ccflags};')
 
 CC := gcc
-CFLAGS := -fPIC -Wall -Wno-unused -I$(PERLINCDIR) $(PERLCFLAGS) $(EXTRA_CFLAGS)
+CFLAGS := -fPIC -Wall -Wno-unused \
+	-I$(OCAMLLIBDIR) \
+	-I$(PERLINCDIR) $(PERLCFLAGS) \
+	$(EXTRA_CFLAGS) $(EXTRA_EXTRA_CFLAGS)
 
 LIBPERL := $(shell perl -MExtUtils::Embed -e ldopts)
 
@@ -73,7 +92,7 @@ check: test
 
 run-tests:
 	@fails=0; count=0; \
-	export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH; \
+	export LD_LIBRARY_PATH=`pwd`:$$LD_LIBRARY_PATH; \
 	for prog in $(TEST_PROGRAMS); do \
 	  if ! $$prog; then \
 	    echo Test $$prog failed; \