Updated ProbLog Makefile and updated Problog top files.

packages/ProbLog/Makefile.in

@@ -1,14 +1,52 @@
-default:
+#
-	@(cd simplecudd; \
+# default base directory for YAP installation
-	echo Making simplecudd...; \
+#
-	make)
+ROOTDIR = @prefix@
-	pwd
+#
-	cp simplecudd/ProblogBDD .
+# where the binary should be
+#
+BINDIR = $(ROOTDIR)/bin
+#
+# where YAP should look for binary libraries
+#
+LIBDIR=$(ROOTDIR)/lib/Yap
+#
+# where YAP should look for architecture-independent Prolog libraries
+#
+SHAREDIR=$(ROOTDIR)/share
+#
+#
+# You shouldn't need to change what follows.
+#
+INSTALL=@INSTALL@
+INSTALL_DATA=@INSTALL_DATA@
+INSTALL_PROGRAM=@INSTALL_PROGRAM@
+srcdir=@srcdir@
+YAP_EXTRAS=@YAP_EXTRAS@ 
+
+PROGRAMS= \
+	$(srcdir)/problog.yap \
+	$(srcdir)/problog_learning.yap
+
+PROBLOG_PROGRAMS= \
+	$(srcdir)/problog/flags.yap \
+	$(srcdir)/problog/print.yap \
+	$(srcdir)/problog/tptree.yap
+
+LEARNING_PROGRAMS = \
+	$(srcdir)/problog_learning/logger.yap \
+
+EXAMPLES = \
+	$(srcdir)/problog_examples/graph.pl \
+	$(srcdir)/problog_examples/learn_graph.pl
+
+install: $(PROGRAMS) $(LEARNING_PROGRAMS)  $(EXAMPLE_PROGRAMS) 
+	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
+	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/problog
+	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/problog_examples
+	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/problog_learning
+	for p in $(PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap; done
+	for p in $(PROBLOG_PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap/problog; done
+	for p in $(LEARNING_PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap/problog_learning; done
+	for p in $(EXAMPLES); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap/problog_examples; done
 
-clean:
-	@(cd simplecudd; \
-	echo Cleaning simplecudd...; \
-	make clean; \
-	cd ..)
-	rm -rf ProblogBDD output queries
-	

packages/ProbLog/problog.yap

@@ -101,7 +101,8 @@
 
 % directory where ProblogBDD executable is located
 % automatically set during loading -- assumes it is in same place as this file (problog.yap)
-:- getcwd(PD),retractall(problog_dir(_)),assert(problog_dir(PD)).
+%:- getcwd(PD),retractall(problog_dir(_)),assert(problog_dir(PD)).
+:- yap_flag(shared_object_search_path,PD),retractall(problog_dir(_)),assert(problog_dir(PD)).
 
 %%%%%%%%%%%%%%%%%%%%%%%%
 % help