--- Yap-5.1.2.orig/LGPL/chr/Makefile.in	2005-10-29 13:47:10.000000000 +1300
+++ Yap-5.1.2/LGPL/chr/Makefile.in	2007-11-20 20:58:04.000000000 +1300
@@ -47,39 +47,50 @@
 		$(srcdir)/Benchmarks/bool.chr $(srcdir)/Benchmarks/family.chr $(srcdir)/Benchmarks/fibonacci.chr $(srcdir)/Benchmarks/leq.chr $(srcdir)/Benchmarks/listdom.chr \
 		$(srcdir)/Benchmarks/chrdif.chr
 
+BOOTSTRAP=bootstrap('../../pl/init.yap'),module(user),['chr_swi_bootstrap']
+
 all:		chr_translate.pl
 
 chr_translate_bootstrap1.pl: $(srcdir)/chr_translate_bootstrap1.chr
-		$(PL) -l chr_swi_bootstrap.yap \
-		      -g "chr_compile_step1('$<','$@'),halt." \
-		      -z 'halt(1).'
-		$(PL) -l chr_swi_bootstrap.yap \
-		      -g "chr_compile_step2('$<','$@'),halt." \
-		      -z 'halt(1).'
+		echo "$(BOOTSTRAP),chr:chr_compile_step1('$<','$@'),halt." | \
+		      LD_LIBRARY_PATH=../..:system:yap2swi \
+		      YAPSHAREDIR=$(PWD)/../../library \
+		      $(PL) -b ../../pl/boot.yap
+		echo "$(BOOTSTRAP),chr:chr_compile_step2('$<','$@'),halt." | \
+		      LD_LIBRARY_PATH=../..:system:yap2swi \
+		      YAPSHAREDIR=$(PWD)/../../library \
+		      $(PL) -b ../../pl/boot.yap
 
 chr_translate_bootstrap2.pl: $(srcdir)/chr_translate_bootstrap2.chr  chr_translate_bootstrap1.pl
-		$(PL) -l chr_swi_bootstrap.yap \
-		      -g "chr_compile_step2('$<','$@'),halt." \
-		      -z 'halt(1).'
-		$(PL) -l chr_swi_bootstrap.yap \
-		      -g "chr_compile_step3('$<','$@'),halt." \
-		      -z 'halt(1).'
+		echo "$(BOOTSTRAP),chr:chr_compile_step2('$<','$@'),halt." | \
+		      LD_LIBRARY_PATH=../..:system:yap2swi \
+		      YAPSHAREDIR=$(PWD)/../../library \
+		      $(PL) -b ../../pl/boot.yap
+		echo "$(BOOTSTRAP),chr:chr_compile_step3('$<','$@'),halt." | \
+		      LD_LIBRARY_PATH=../..:system:yap2swi \
+		      YAPSHAREDIR=$(PWD)/../../library \
+		      $(PL) -b ../../pl/boot.yap
 
 guard_entailment.pl: $(srcdir)/guard_entailment.chr chr_translate_bootstrap2.pl 
-		$(PL) -l chr_swi_bootstrap.yap \
-		      -g "chr_compile_step3('$<','$@'),halt." \
-		      -z 'halt(1).'
+		echo "$(BOOTSTRAP),chr:chr_compile_step3('$<','$@'),halt." | \
+		      LD_LIBRARY_PATH=../..:system:yap2swi \
+		      YAPSHAREDIR=$(PWD)/../../library \
+		      $(PL) -b ../../pl/boot.yap
 
 chr_translate.pl: $(srcdir)/chr_translate.chr chr_translate_bootstrap2.pl guard_entailment.pl
-		$(PL) -l chr_swi_bootstrap.yap \
-		      -g "chr_compile_step3('$<','$@'),halt." \
-		      -z 'halt(1).'
-		$(PL) -p chr=. -l chr_swi_bootstrap.yap \
-		      -g "chr_compile_step4('guard_entailment.chr','guard_entailment.pl'),halt." \
-		      -z 'halt(1).'
-		$(PL) -p chr=. -l chr_swi_bootstrap.yap \
-		      -g "chr_compile_step4('$<','$@'),halt." \
-		      -z 'halt(1).'
+		echo "$(BOOTSTRAP),chr:chr_compile_step3('$<','$@'),halt." | \
+		      LD_LIBRARY_PATH=../..:system:yap2swi \
+		      YAPSHAREDIR=$(PWD)/../../library \
+		      $(PL) -b ../../pl/boot.yap
+		echo "$(BOOTSTRAP),asserta(user:file_search_path(chr,'.')),chr:chr_compile_step4('guard_entailment.chr','guard_entailment.pl'),halt." | \
+		      LD_LIBRARY_PATH=../..:system:yap2swi \
+		      YAPSHAREDIR=$(PWD)/../../library \
+		      $(PL) -b ../../pl/boot.yap
+		cp ../clp/clp_events.pl ../../library/clp
+		echo "$(BOOTSTRAP),asserta(user:file_search_path(chr,'.')),chr:chr_compile_step4('$<','$@'),halt." | \
+		      LD_LIBRARY_PATH=../..:system:yap2swi \
+		      YAPSHAREDIR=$(PWD)/../../library \
+		      $(PL) -b ../../pl/boot.yap
 
 chr.pl:		chr_swi.pl
 		cp $< $@