find dBus directly in the ocaml path.

diff --git a/common/test/Makefile b/common/test/Makefile
index f4913046ee731430736fe74ce5509f08bd027270..f2f84e77c29bc87ba84a5924eb44a32ee06c519a 100644 (file)
--- a/common/test/Makefile
+++ b/common/test/Makefile
@@ -1,10 +1,7 @@
 TOPLEVEL=../..
 include $(TOPLEVEL)/common.make
 
-DBUS_INSTALL_DIR ?= $(OCAML_DIR)/dist/lib/ocaml
-
-OCAMLINCLUDE += -I $(TOPLEVEL)/libs/stdext -I $(TOPLEVEL)/common \
-       -I $(DBUS_INSTALL_DIR)
+OCAMLINCLUDE += -I $(TOPLEVEL)/libs/stdext -I $(TOPLEVEL)/common
 
 OCAMLOPTFLAGS += -g -thread
 
@@ -12,10 +9,10 @@ dbus_mon_OBJS = \
        $(TOPLEVEL)/common/connection_table $(TOPLEVEL)/common/async_conn \
        $(TOPLEVEL)/common/dbus_conn dbus_mon
 
-dbus_mon_LIBS = unix.cmxa \
+dbus_mon_LIBS = unix.cmxa dBus.cmxa \
        $(TOPLEVEL)/libs/uuid/uuid.cmxa \
        -ccopt -L -ccopt $(TOPLEVEL)/libs/stdext $(TOPLEVEL)/libs/stdext/stdext.cmxa \
-       -ccopt -L -ccopt $(DBUS_INSTALL_DIR) $(DBUS_INSTALL_DIR)/dBus.cmxa
+       -ccopt -L -ccopt $(DBUS_INSTALL_DIR)
 
 ALL_OCAML_OBJS = $(dbus_mon_OBJS)