From e490b53c452eaaffcf6f75db9cf7e7c1ade7e95a Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 2 Mar 2004 23:47:11 +0000
Subject: [PATCH] Added coreutils, diffutils, grep, less, sed (another one?),
 and sharutils to the build, and fixed some small problems. Most of the stuff
 still doesn't build properly.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6862 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/bin/Jamfile                     | 12 +++++++++---
 src/apps/bin/coreutils-5.0/lib/Jamfile   |  2 +-
 src/apps/bin/coreutils-5.0/src/Jamfile   |  1 +
 src/apps/bin/diffutils-2.8.1/lib/Jamfile |  2 +-
 src/apps/bin/diffutils-2.8.1/src/Jamfile |  3 ++-
 src/apps/bin/grep-2.5/lib/Jamfile        |  2 +-
 src/apps/bin/grep-2.5/src/Jamfile        |  3 ++-
 src/apps/bin/less-381/Jamfile            |  2 +-
 src/apps/bin/sed-4.0.9/lib/Jamfile       |  2 +-
 src/apps/bin/sed-4.0.9/sed/Jamfile       |  3 ++-
 src/apps/bin/sharutils-4.2.1/lib/Jamfile |  2 +-
 src/apps/bin/sharutils-4.2.1/src/Jamfile |  3 ++-
 12 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/apps/bin/Jamfile b/src/apps/bin/Jamfile
index b5562156da..1dccecda10 100644
--- a/src/apps/bin/Jamfile
+++ b/src/apps/bin/Jamfile
@@ -72,15 +72,21 @@ StdBinCommands
 	whoami.c
 	;
 
-#SubInclude OBOS_TOP src apps bin gnu ;
 SubInclude OBOS_TOP src apps bin addattr ;
 SubInclude OBOS_TOP src apps bin chkbfs ;
+SubInclude OBOS_TOP src apps bin coreutils-5.0 ;
 SubInclude OBOS_TOP src apps bin desklink ;
+SubInclude OBOS_TOP src apps bin diffutils-2.8.1 ;
+#SubInclude OBOS_TOP src apps bin gnu ;
+SubInclude OBOS_TOP src apps bin grep-2.5 ;
+SubInclude OBOS_TOP src apps bin less-381 ;
 SubInclude OBOS_TOP src apps bin listdev ;
-SubInclude OBOS_TOP src apps bin mkdos ;
 SubInclude OBOS_TOP src apps bin makeudfimage ;
+SubInclude OBOS_TOP src apps bin mkdos ;
 SubInclude OBOS_TOP src apps bin pc ;
-SubInclude OBOS_TOP src apps bin sed ;
+#SubInclude OBOS_TOP src apps bin sed ;
+SubInclude OBOS_TOP src apps bin sed-4.0.9 ;
+SubInclude OBOS_TOP src apps bin sharutils-4.2.1 ;
 
 # RCS commands
 SubInclude OBOS_TOP src apps bin rcs ;
diff --git a/src/apps/bin/coreutils-5.0/lib/Jamfile b/src/apps/bin/coreutils-5.0/lib/Jamfile
index 1321962b4e..7b15483ca7 100644
--- a/src/apps/bin/coreutils-5.0/lib/Jamfile
+++ b/src/apps/bin/coreutils-5.0/lib/Jamfile
@@ -1,6 +1,6 @@
 SubDir OBOS_TOP src apps bin coreutils-5.0 lib ;
 
-SubDirCcFlags += -DHAVE_CONFIG_H ;
+SubDirCcFlags -DHAVE_CONFIG_H ;
 
 StaticLibrary fetish : 
 __fpending.c
diff --git a/src/apps/bin/coreutils-5.0/src/Jamfile b/src/apps/bin/coreutils-5.0/src/Jamfile
index 605de7a7ec..e80dd56492 100644
--- a/src/apps/bin/coreutils-5.0/src/Jamfile
+++ b/src/apps/bin/coreutils-5.0/src/Jamfile
@@ -1,6 +1,7 @@
 SubDir OBOS_TOP src apps bin coreutils-5.0 src ;
 
 SubDirCcFlags -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' ;
+SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
 
 StdBinCommands
 	basename.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/Jamfile b/src/apps/bin/diffutils-2.8.1/lib/Jamfile
index e14cc3be18..95dfc2b516 100644
--- a/src/apps/bin/diffutils-2.8.1/lib/Jamfile
+++ b/src/apps/bin/diffutils-2.8.1/lib/Jamfile
@@ -1,6 +1,6 @@
 SubDir OBOS_TOP src apps bin diffutils-2.8.1 lib ;
 
-SubDirCcFlags += -DHAVE_CONFIG_H ;
+SubDirCcFlags -DHAVE_CONFIG_H ;
 
 StaticLibrary diffutils : 
 alloca.c
diff --git a/src/apps/bin/diffutils-2.8.1/src/Jamfile b/src/apps/bin/diffutils-2.8.1/src/Jamfile
index 047a085d31..41b21e73de 100644
--- a/src/apps/bin/diffutils-2.8.1/src/Jamfile
+++ b/src/apps/bin/diffutils-2.8.1/src/Jamfile
@@ -1,6 +1,7 @@
 SubDir OBOS_TOP src apps bin diffutils-2.8.1 src ;
 
-SubDirCcFlags += -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' ;
+SubDirCcFlags -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' ;
+SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
 
 BinCommand diff : 
   	analyze.c context.c diff.c dir.c ed.c ifdef.c io.c normal.c side.c util.c version.c : root libdiffutils.a ;
diff --git a/src/apps/bin/grep-2.5/lib/Jamfile b/src/apps/bin/grep-2.5/lib/Jamfile
index 6a5482d930..7642430c91 100644
--- a/src/apps/bin/grep-2.5/lib/Jamfile
+++ b/src/apps/bin/grep-2.5/lib/Jamfile
@@ -1,6 +1,6 @@
 SubDir OBOS_TOP src apps bin grep-2.5 lib ;
 
-SubDirCcFlags += -DHAVE_CONFIG_H ;
+SubDirCcFlags -DHAVE_CONFIG_H ;
 
 StaticLibrary greputils : 
 alloca.c
diff --git a/src/apps/bin/grep-2.5/src/Jamfile b/src/apps/bin/grep-2.5/src/Jamfile
index 336ea326fc..5a176757ce 100644
--- a/src/apps/bin/grep-2.5/src/Jamfile
+++ b/src/apps/bin/grep-2.5/src/Jamfile
@@ -1,6 +1,7 @@
 SubDir OBOS_TOP src apps bin grep-2.5 src ;
 
-SubDirCcFlags += -I ../lib -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' ;
+SubDirCcFlags -I ../lib -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' ;
+SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
 
 BinCommand grep : dfa.c grep.c grepmat.c kwset.c search.c : root libgreputils.a ;
 
diff --git a/src/apps/bin/less-381/Jamfile b/src/apps/bin/less-381/Jamfile
index 798a7a7b6e..aeee5c6440 100644
--- a/src/apps/bin/less-381/Jamfile
+++ b/src/apps/bin/less-381/Jamfile
@@ -1,6 +1,6 @@
 SubDir OBOS_TOP src apps bin less-381 ;
 
-SubDirCcFlags += -DSYSDIR=\'\"/etc\"\' ;
+SubDirCcFlags -DSYSDIR=\'\"/etc\"\' ;
 
 BinCommand less : 
 	main.c screen.c brac.c ch.c charset.c cmdbuf.c command.c decode.c edit.c filename.c forwback.c 
diff --git a/src/apps/bin/sed-4.0.9/lib/Jamfile b/src/apps/bin/sed-4.0.9/lib/Jamfile
index 055431ea92..57d021dd24 100644
--- a/src/apps/bin/sed-4.0.9/lib/Jamfile
+++ b/src/apps/bin/sed-4.0.9/lib/Jamfile
@@ -1,6 +1,6 @@
 SubDir OBOS_TOP src apps bin sed-4.0.9 lib ;
 
-SubDirCcFlags += -DHAVE_CONFIG_H ;
+SubDirCcFlags -DHAVE_CONFIG_H ;
 
 StaticLibrary sedutils : 
 alloca.c getline.c getopt.c getopt1.c memchr.c memcmp.c memmove.c mkstemp.c obstack.c
diff --git a/src/apps/bin/sed-4.0.9/sed/Jamfile b/src/apps/bin/sed-4.0.9/sed/Jamfile
index a5e2d19884..188b9f6734 100644
--- a/src/apps/bin/sed-4.0.9/sed/Jamfile
+++ b/src/apps/bin/sed-4.0.9/sed/Jamfile
@@ -1,5 +1,6 @@
 SubDir OBOS_TOP src apps bin sed-4.0.9 sed ;
 
-SubDirCcFlags += -I ../lib -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' ;
+SubDirCcFlags -I ../lib -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' ;
+SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
 
 BinCommand sed : compile.c execute.c fmt.c regexp.c sed.c : root libsedutils.a ; 
diff --git a/src/apps/bin/sharutils-4.2.1/lib/Jamfile b/src/apps/bin/sharutils-4.2.1/lib/Jamfile
index e1aad97e72..523d98d0d2 100644
--- a/src/apps/bin/sharutils-4.2.1/lib/Jamfile
+++ b/src/apps/bin/sharutils-4.2.1/lib/Jamfile
@@ -1,6 +1,6 @@
 SubDir OBOS_TOP src apps bin sharutils-4.2.1 lib ;
 
-SubDirCcFlags += -DHAVE_CONFIG_H ;
+SubDirCcFlags -DHAVE_CONFIG_H ;
 
 StaticLibrary sharutils : 
 alloca.c
diff --git a/src/apps/bin/sharutils-4.2.1/src/Jamfile b/src/apps/bin/sharutils-4.2.1/src/Jamfile
index 8fc0ed1f17..22526fa2d7 100644
--- a/src/apps/bin/sharutils-4.2.1/src/Jamfile
+++ b/src/apps/bin/sharutils-4.2.1/src/Jamfile
@@ -1,6 +1,7 @@
 SubDir OBOS_TOP src apps bin sharutils-4.2.1 src ;
 
-SubDirCcFlags += -I ../lib -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' ;
+SubDirCcFlags -I ../lib -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' ;
+SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
 
 BinCommand shar : 
   	shar.c encode.c : root libsharutils.a ;