about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Src/Makemod.in.in4
-rw-r--r--Src/mkmakemod.sh6
-rw-r--r--Src/zsh.mdd2
4 files changed, 10 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index bfb02a11d..ea25e5c29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-05-10  Peter Stephenson  <pws@csr.com>
 
+	* 29214: Src/Makemod.in.in, Src/mkmakemod.sh, Src/zsh.mdd: use
+	-I to find headers in order to allow #include'ing generated
+	headers from non-generated headers when the build tree is
+	separate from the source tree.
+
 	* 29191 (Danek) and 29203 (with fixes): Doc/Zsh/params.yo,
 	Src/params.c: make TERMINFO variable special.
 
@@ -14637,5 +14642,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5287 $
+* $Revision: 1.5288 $
 *****************************************************
diff --git a/Src/Makemod.in.in b/Src/Makemod.in.in
index 9a606d14a..ea0cdc3a4 100644
--- a/Src/Makemod.in.in
+++ b/Src/Makemod.in.in
@@ -47,8 +47,8 @@ dir_src       = $(dir_top)/Src
 
 DNCFLAGS =
 
-COMPILE     = $(CC) -c -I. $(CPPFLAGS) $(DEFS) $(CFLAGS) $(D@L@CFLAGS)
-DLCOMPILE   = $(CC) -c -I. $(CPPFLAGS) $(DEFS) -DMODULE $(CFLAGS) $(DLCFLAGS)
+COMPILE     = $(CC) -c -I. -I$(dir_top)/Src -I$(sdir_top)/Src -I$(sdir_top)/Src/Zle -I$(sdir) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(D@L@CFLAGS)
+DLCOMPILE   = $(CC) -c -I. -I$(dir_top)/Src -I$(sdir_top)/Src -I$(sdir_top)/Src/Zle -I$(sdir) $(CPPFLAGS) $(DEFS) -DMODULE $(CFLAGS) $(DLCFLAGS)
 LINK        = $(CC) $(LDFLAGS) $(EXELDFLAGS) $(EXTRA_LDFLAGS) -o $@
 DLLINK      = $(DLLD) $(LDFLAGS) $(LIBLDFLAGS) $(DLLDFLAGS) -o $@
 
diff --git a/Src/mkmakemod.sh b/Src/mkmakemod.sh
index 2e0963f8e..2633c27d4 100644
--- a/Src/mkmakemod.sh
+++ b/Src/mkmakemod.sh
@@ -383,11 +383,7 @@ if $first_stage; then
 	if test -n "$headers"; then
 	    echo "	    echo '/* Extra headers for this module */'; \\"
 	    echo "	    for hdr in $headers; do \\"
-	    echo "		if test -f \$\$hdr; then \\"
-	    echo "		    echo '# include \"'\$\$hdr'\"'; \\"
-	    echo "		else \\"
-	    echo "		    echo '# include \"\$(sdir)/'\$\$hdr'\"'; \\"
-	    echo "		fi; \\"
+	    echo "		echo '# include \"'\$\$hdr'\"'; \\"
 	    echo "	    done; \\"
 	    echo "	    echo; \\"
 	fi
diff --git a/Src/zsh.mdd b/Src/zsh.mdd
index 25f4df10f..520c3acc9 100644
--- a/Src/zsh.mdd
+++ b/Src/zsh.mdd
@@ -127,7 +127,7 @@ clean.zsh:
 
 # This is not properly part of this module, but it is built as if it were.
 main.o: main.c zsh.mdh main.epro
-	$(CC) -c -I. $(CPPFLAGS) $(DEFS) $(CFLAGS) -o $@ $(sdir)/main.c
+	$(CC) -c -I. -I$(sdir_top)/Src $(CPPFLAGS) $(DEFS) $(CFLAGS) -o $@ $(sdir)/main.c
 
 main.syms: $(PROTODEPS)
 proto.zsh: main.epro