First steps of making builds outside the source

directory possible.  These should get us as far
as miniperl, then building DynaLoader falls into
tiny twinkling pieces as MakeMaker knows nothing
of VPATH mindset.

p4raw-id: //depot/cfgperl@3735

2 files changed, 11 insertions, 5 deletions

diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index 9c004cc778..6a179587fe 100755
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -1,4 +1,4 @@
-case $CONFIG in
+case $CONFIGDOTSH in
 '')
 	if test -f config.sh; then TOP=.;
 	elif test -f ../config.sh; then TOP=..;
@@ -63,6 +63,12 @@ TRNL = '$trnl'
 
 .SUFFIXES: .c \$(OBJ_EXT)
 
+# this is where the sources are
+src    = $src
+
+# nice makes grok this
+VPATH = .:$src
+
 !GROK!THIS!
 
 cat >>Makefile <<'!NO!SUBS!'
@@ -89,9 +95,9 @@ plm   = a2p.loadmap
 
 addedbyconf = $(shextract) $(plextract)
 
-h = EXTERN.h INTERN.h ../config.h ../handy.h hash.h a2p.h str.h util.h
+h = EXTERN.h INTERN.h ../config.h handy.h hash.h a2p.h str.h util.h
 
-c = hash.c $(mallocsrc) str.c util.c walk.c
+c = hash.c str.c util.c walk.c
 
 obj = hash$(OBJ_EXT) $(mallocobj) str$(OBJ_EXT) util$(OBJ_EXT) walk$(OBJ_EXT)
 
@@ -147,7 +153,7 @@ lint:
 	lint $(lintflags) $(defs) $(c) > a2p.fuzz
 
 depend: $(mallocsrc) ../makedepend
-	sh ../makedepend MAKE=$(MAKE)
+	sh ../makedepend MAKE=$(MAKE) src=$(src)/x2p
 
 clist:
 	echo $(c) | tr ' ' $(TRNL) >.clist
diff --git a/x2p/cflags.SH b/x2p/cflags.SH
index a58d7d564d..b5ef9170b9 100755
--- a/x2p/cflags.SH
+++ b/x2p/cflags.SH
@@ -1,4 +1,4 @@
-case $CONFIG in
+case $CONFIGDOTSH in
 '')
 	if test -f config.sh; then TOP=.;
 	elif test -f ../config.sh; then TOP=..;