summaryrefslogtreecommitdiff
blob: e171888de9f90e5b4a3f351eb0639265c28e54d6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
Fixes dependencies of headers included by headers in another directory.

--- jam-2.5/Jambase
+++ jam-2.5/Jambase
@@ -710,7 +710,7 @@
 	local s = $(>:G=$(HDRGRIST:E)) ;
 
 	Includes $(<) : $(s) ;
-	SEARCH on $(s) = $(HDRSEARCH) ;
+	SEARCH on $(s) = $(<:D) $(HDRSEARCH) ;
 	NoCare $(s) ;
 
 	# Propagate on $(<) to $(>)
--- jam-2.5/headers.c
+++ jam-2.5/headers.c
@@ -67,7 +67,7 @@
 
 	lol_init( &lol );
 
-	lol_add( &lol, list_new( L0, t->name, 1 ) );
+	lol_add( &lol, list_new( L0, t->boundname, 1 ) );
 	lol_add( &lol, headers1( t->boundname, hdrscan ) );
 
 	if( lol_get( &lol, 1 ) )
--- jam-2.5/jambase.c
+++ jam-2.5/jambase.c
@@ -452,7 +452,7 @@
 "{\n",
 "local s = $(>:G=$(HDRGRIST:E)) ;\n",
 "Includes $(<) : $(s) ;\n",
-"SEARCH on $(s) = $(HDRSEARCH) ;\n",
+"SEARCH on $(s) = $(<:D) $(HDRSEARCH) ;\n",
 "NoCare $(s) ;\n",
 "HDRSEARCH on $(s) = $(HDRSEARCH) ;\n",
 "HDRSCAN on $(s) = $(HDRSCAN) ;\n",