Now lablgtk dir is automatically found

diff --git a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20001129_gtkmathview-0.2.1/Makefile b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20001129_gtkmathview-0.2.1/Makefile
index b8adbb47bcb71f254f149d1370c76074fbe2d90d..0bdfed0af21cd0f2f5fcb91d2d2b891333ccbbe0 100644 (file)
--- a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20001129_gtkmathview-0.2.1/Makefile
+++ b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20001129_gtkmathview-0.2.1/Makefile
@@ -1,6 +1,5 @@
 # Makefile for lablgtk_mathview.
 
-LABLGTKDIR = /usr/lib/ocaml/lablgtk
 MINIDOMDIR = ./minidom
 TESTDIR = ./test
 MLFLAGS += -I $(LABLGTKDIR) -I $(MINIDOMDIR)

diff --git a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20001129_gtkmathview-0.2.1/configure.mk b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20001129_gtkmathview-0.2.1/configure.mk
index 8982371eec9c494a9a550f996da92abbfee40fc1..15e2c3735e7356b39324c83c7d38bbbd2820300e 100644 (file)
--- a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20001129_gtkmathview-0.2.1/configure.mk
+++ b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20001129_gtkmathview-0.2.1/configure.mk
@@ -14,6 +14,8 @@ LIBDIR = `$(GETLIBDIR)`
 GETBINDIR = $(GETLIBDIR) | sed -e 's|/lib/[^/]*$$|/bin|' -e 's|/lib$$|/bin|'
 GETRANLIB = which ranlib 2>/dev/null | sed -e 's|.*/ranlib$$|!|' -e 's/^[^!]*$$/:/' -e 's/!/ranlib/'
 
+LABLGTKDIR = $(LIBDIR)/lablgtk
+
 ifdef USE_GNOME
 GTKGETCFLAGS = gtk-config --cflags`" -I"`gnome-config --includedir
 GNOMELIBS = `gnome-config --libs gtkxmhtml`
@@ -40,6 +42,7 @@ config.make:
        @echo LIBDIR=$(LIBDIR) >> config.make
        @echo BINDIR=`$(GETBINDIR)` >> config.make
        @echo INSTALLDIR=$(INSTALLDIR) >> config.make
+       @echo LABLGTKDIR=$(LABLGTKDIR) >> config.make
 # Luca: was
 #      @echo GTKCFLAGS=`$(GTKGETCFLAGS)` -I/usr/lib/ocaml/lablgtk >> config.make
 # Luca: now

diff --git a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20001129_gtkmathview-0.2.1/minidom/Makefile b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20001129_gtkmathview-0.2.1/minidom/Makefile
index 6fe73af6a3a311569826b4349e1c1ec01b529177..cacfccacb02308da4bcd6df7e9b7cef73a68ca25 100644 (file)
--- a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20001129_gtkmathview-0.2.1/minidom/Makefile
+++ b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20001129_gtkmathview-0.2.1/minidom/Makefile
@@ -1,4 +1,5 @@
-LIBDIR = /usr/lib/ocaml
+GETLIBDIR = ocamlc -v | grep "^Standard" | sed 's/^.*: *//'
+LIBDIR = `$(GETLIBDIR)`
 INSTALLDIR = $(LIBDIR)/minidom
 OBJECTS = minidom.cmi minidom.cmo ml_minidom.o ominidom.cmi ominidom.cmo
 OBJECTS_OPT = minidom.cmx ominidom.cmx
@@ -9,7 +10,7 @@ all: $(OBJECTS) test
 opt: $(OBJECTS_OPT) test.opt
 
 ml_minidom.o: ml_minidom.c
-       gcc -c -I/usr/lib/ocaml/caml/ `glib-config --cflags` `minidom-config --cflags` $<
+       gcc -c -I$(LIBDIR)/caml/ `glib-config --cflags` `minidom-config --cflags` $<
 
 minidom.cmi: minidom.mli
        ocamlc -c $<