From d80c170adf181054e25099bfe7ef769a050f32bb Mon Sep 17 00:00:00 2001
From: ocoursiere <ocoursiere@d5ff2aa3-e835-421f-bc93-9a7aa3229f71>
Date: Thu, 31 Jul 2003 18:07:58 +0000
Subject: [PATCH] Use of mkdir -p + other updates

---
 bepascal/Jamfile                     | 48 +++++++++++++++++++++-------
 bepascal/Jamrules                    |  2 +-
 bepascal/source/bepascal/cpp/Jamfile |  5 +--
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/bepascal/Jamfile b/bepascal/Jamfile
index ee628eb..b52823b 100644
--- a/bepascal/Jamfile
+++ b/bepascal/Jamfile
@@ -23,28 +23,50 @@ SubDir BEPASCAL_TOP ;
 # Force creation of target's directories BEFORE the building of libbepascal.so
 Depends libbepascal.so : dirs ;
 
-SubInclude BEPASCAL_TOP source ;
-
 # set the distribution dir
 DISTRIB_DIR = distrib ;
 LIBBEPASCAL_INSTALL_DIR = /boot/home/config/lib ;
 
+# clean SEARCH var when building zip files. if not, some files are imported
+# from source/bepascal/cpp instead, maybe because of the Jam-engine.
+# example : Jamfile
+SEARCH on bin_bepascal.zip = . ;
+SEARCH on pas_sources.zip = . ;
+SEARCH on cpp_sources.zip = . ;
+SEARCH on demos.zip = . ;
+SEARCH on docs.zip = . ;
+
 rule MakeDistribs
 {
-	MkDir $(DISTRIB_DIR) ;
+	MkDir -p $(DISTRIB_DIR) ;
 	# copy libbepascal.so in lib
-	Bulk lib : libbepascal.so ;
-	Bulk lib : libstubgen.so ;
+	Bulk lib : libbepascal.so libstubgen.so ;
 	Depends all :  ;
 	# binary files like libbepascal.so are needed to build bin_bepascal.zip
 	Depends bin_bepascal.zip : libbepascal.so ;
-	# make all distribution files. We recursively add all files in those directories except the ones in
-	# CVS subdirectories
-	MakeZip pas_sources.zip : source/bepascal/pas ;
-	MakeZip cpp_sources.zip : source/bepascal/cpp ;
-	MakeZip bin_bepascal.zip : source/bepascal/pas lib ;
-	MakeZip demos.zip : demos ;
-	MakeZip docs.zip : docs ;
+	# make all distribution files. We recursively add all files 
+	# in those directories except the ones in CVS subdirectories
+	# We also add Jamfiles for building and installing the included
+	# sources
+	MakeZip bin_bepascal.zip :  Readme 
+	                            Jamfile 
+	                            Jamrules 
+	                            source/Jamfile 
+	                            source/bepascal/Jamfile
+	                            source/bepascal/pas 
+	                            lib ;
+	MakeZip pas_sources.zip : Readme 
+	                          Jamfile 
+	                          Jamrules 
+	                          source/bepascal/pas ;
+	MakeZip cpp_sources.zip : Readme 
+	                          Jamfile 
+	                          Jamrules 
+	                          source/bepascal/cpp ;
+	MakeZip demos.zip : Readme 
+	                    demos ;
+	MakeZip docs.zip : Readme 
+	                   docs ;
 }
 
 # Install libbepascal.so in LIBBEPASCAL_INSTALL_DIR (/boot/home/config/lib)
@@ -53,3 +75,5 @@ InstallLib $(LIBBEPASCAL_INSTALL_DIR) : libstubgen.so ;
 
 # Make distribution files
 MakeDistribs ;
+
+SubInclude BEPASCAL_TOP source ;
diff --git a/bepascal/Jamrules b/bepascal/Jamrules
index 6030a1e..4de1628 100644
--- a/bepascal/Jamrules
+++ b/bepascal/Jamrules
@@ -56,5 +56,5 @@ rule MakeZip
 
 actions MakeZip
 {
-	zip $(DISTRIB_DIR)/$(1) -r $(2) -x \*CVS\*
+	zip $(DISTRIB_DIR)/$(1) -r $(2) -x \*CVS\* 
 }
diff --git a/bepascal/source/bepascal/cpp/Jamfile b/bepascal/source/bepascal/cpp/Jamfile
index 3449d27..ab7de24 100644
--- a/bepascal/source/bepascal/cpp/Jamfile
+++ b/bepascal/source/bepascal/cpp/Jamfile
@@ -119,7 +119,8 @@ LIBPATHS =  ;
 # Additional paths to look for system headers
 #	These use the form: #include <header>
 #	source file directories are NOT auto-included here
-SYSTEM_INCLUDE_PATHS = $(SEARCH_SOURCE)/include/be/app 
+SYSTEM_INCLUDE_PATHS = . 
+                       $(SEARCH_SOURCE)/include/be/app 
                        $(SEARCH_SOURCE)/include/be/bepas_kernel
                        $(SEARCH_SOURCE)/include/be/interface
                        $(SEARCH_SOURCE)/include/be/support
@@ -161,7 +162,7 @@ DEBUGGER =  ;
 COMPILER_FLAGS =  ;
 
 # Specify additional linker flags
-LINKER_FLAGS =  ;
+LINKER_FLAGS on libbepascal.so =  ;
 
 # (for TYPE == DRIVER only) Specify desired location of driver in the /dev
 #	hierarchy. Used by the driverinstall rule. E.g., DRIVER_PATH = video/usb will