From 107af59dd86bd304bd0da1dda826f94ae3aa12c7 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Mon, 16 Feb 2009 12:33:37 +0000
Subject: [PATCH] BEAM is not quite a package

---
 {packages/BEAM => BEAM}/eam.h          | 0
 {packages/BEAM => BEAM}/eam_am.c       | 0
 {packages/BEAM => BEAM}/eam_gc.c       | 0
 {packages/BEAM => BEAM}/eam_showcode.c | 0
 {packages/BEAM => BEAM}/eam_split.c    | 0
 {packages/BEAM => BEAM}/eamamasm.c     | 0
 {packages/BEAM => BEAM}/eamamasm.h     | 0
 {packages/BEAM => BEAM}/eamindex.c     | 0
 {packages/BEAM => BEAM}/toeam.c        | 0
 Makefile.in                            | 6 +++---
 10 files changed, 3 insertions(+), 3 deletions(-)
 rename {packages/BEAM => BEAM}/eam.h (100%)
 rename {packages/BEAM => BEAM}/eam_am.c (100%)
 rename {packages/BEAM => BEAM}/eam_gc.c (100%)
 rename {packages/BEAM => BEAM}/eam_showcode.c (100%)
 rename {packages/BEAM => BEAM}/eam_split.c (100%)
 rename {packages/BEAM => BEAM}/eamamasm.c (100%)
 rename {packages/BEAM => BEAM}/eamamasm.h (100%)
 rename {packages/BEAM => BEAM}/eamindex.c (100%)
 rename {packages/BEAM => BEAM}/toeam.c (100%)

diff --git a/packages/BEAM/eam.h b/BEAM/eam.h
similarity index 100%
rename from packages/BEAM/eam.h
rename to BEAM/eam.h
diff --git a/packages/BEAM/eam_am.c b/BEAM/eam_am.c
similarity index 100%
rename from packages/BEAM/eam_am.c
rename to BEAM/eam_am.c
diff --git a/packages/BEAM/eam_gc.c b/BEAM/eam_gc.c
similarity index 100%
rename from packages/BEAM/eam_gc.c
rename to BEAM/eam_gc.c
diff --git a/packages/BEAM/eam_showcode.c b/BEAM/eam_showcode.c
similarity index 100%
rename from packages/BEAM/eam_showcode.c
rename to BEAM/eam_showcode.c
diff --git a/packages/BEAM/eam_split.c b/BEAM/eam_split.c
similarity index 100%
rename from packages/BEAM/eam_split.c
rename to BEAM/eam_split.c
diff --git a/packages/BEAM/eamamasm.c b/BEAM/eamamasm.c
similarity index 100%
rename from packages/BEAM/eamamasm.c
rename to BEAM/eamamasm.c
diff --git a/packages/BEAM/eamamasm.h b/BEAM/eamamasm.h
similarity index 100%
rename from packages/BEAM/eamamasm.h
rename to BEAM/eamamasm.h
diff --git a/packages/BEAM/eamindex.c b/BEAM/eamindex.c
similarity index 100%
rename from packages/BEAM/eamindex.c
rename to BEAM/eamindex.c
diff --git a/packages/BEAM/toeam.c b/BEAM/toeam.c
similarity index 100%
rename from packages/BEAM/toeam.c
rename to BEAM/toeam.c
diff --git a/Makefile.in b/Makefile.in
index ffcdf6e14..5950e769c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,7 +57,7 @@ YAP_EXTRAS=@YAP_EXTRAS@
 #
 CC=@CC@
 MPI_CC=@MPI_CC@
-CPPFLAGS=@CPPFLAGS@  -I. -I$(srcdir)/H -I$(srcdir)/OPTYap -I$(srcdir)/BEAM -I$(srcdir)/MYDDAS
+CPPFLAGS=@CPPFLAGS@  -I. -I$(srcdir)/H -I$(srcdir)/OPTYap -I$(srcdir)/packages/BEAM -I$(srcdir)/MYDDAS
 CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
 C_INTERF_FLAGS= @C_INTERF_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS) -I$(srcdir)/include
 C_PARSER_FLAGS= @C_PARSER_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
@@ -689,8 +689,8 @@ install_data:
 	@INSTALLCLP@(cd LGPL/clp ; $(MAKE) install)
 	@INSTALLCLP@(cd GPL/clpqr ; $(MAKE) install)
 #	(cd CHR ; $(MAKE) install)
-	@INSTALLCLP@(cd LGPL/chr ; $(MAKE) install)
-	@INSTALLCLP@(cd CLPBN ; $(MAKE) install)
+	@INSTALLCLP@(cd packages/chr ; $(MAKE) install)
+	@INSTALLCLP@(cd packages/CLPBN ; $(MAKE) install)
 
 
 ##########