From 3d33327b1e81a101d89d2f20bfbb32edd33d35e9 Mon Sep 17 00:00:00 2001 From: Claudio Sacerdoti Coen Date: Wed, 6 Dec 2000 17:10:37 +0000 Subject: [PATCH] Now lablgtk dir is automatically found --- .../lablgtk-20001129_gtkmathview-0.2.1/Makefile | 1 - .../lablgtk-20001129_gtkmathview-0.2.1/configure.mk | 3 +++ .../lablgtk-20001129_gtkmathview-0.2.1/minidom/Makefile | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) 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 b8adbb47b..0bdfed0af 100644 --- 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 8982371ee..15e2c3735 100644 --- 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 6fe73af6a..cacfccacb 100644 --- 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 $< -- 2.39.2