3 files changed, 17 insertions, 3 deletions
diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4
index 9510a8ee0d..6c040b9bab 100644
--- a/source4/build/m4/env.m4
+++ b/source4/build/m4/env.m4
@@ -16,6 +16,9 @@ export builddir;
 
 AC_SUBST(datarootdir)
 
+AC_SUBST(VPATH)
+VPATH="\$(builddir):\$(srcdir)"
+
 SMB_VERSION_STRING=`cat ${srcdir}/version.h | grep 'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
 echo "SAMBA VERSION: ${SMB_VERSION_STRING}"
 
diff --git a/source4/build/make/lex_compile.sh b/source4/build/make/lex_compile.sh
index 9bba7257b1..d05056d100 100755
--- a/source4/build/make/lex_compile.sh
+++ b/source4/build/make/lex_compile.sh
@@ -31,20 +31,29 @@ if [ -r $DEST ]; then
 	fi
 fi
 TOP=`pwd`
+echo "info: running $LEX $ARGS $file"
 if cd $dir && $LEX $ARGS $file; then
-	if [ -r $base.yy.c ];then
+	if [ -r lex.yy.c ];then
 	        # we must guarantee that config.h comes first
+		echo "info: move lex.yy.c to $base.c"
+	        echo "#include \"config.h\"" > $base.c
+		sed -e "s|lex\.yy\.c|$DEST|" lex.yy.c >> $base.c
+		rm -f $base.yy.c
+	elif [ -r $base.yy.c ];then
+	        # we must guarantee that config.h comes first
+		echo "info: move $base.yy.c to $base.c"
 	        echo "#include \"config.h\"" > $base.c
 		sed -e "s|$base\.yy\.c|$DEST|" $base.yy.c >> $base.c
 		rm -f $base.yy.c
 	elif [ -r $base.c ];then
 	        # we must guarantee that config.h comes first
+		echo "info: add #include \"config.h\" to $base.c"
 		mv $base.c $base.c.tmp
 	        echo "#include \"config.h\"" > $base.c
 		sed -e "s|$base\.yy\.c|$DEST|" $base.c.tmp >> $base.c
 		rm -f $base.c.tmp
 	elif [ ! -r base.c ]; then
-		echo "$base.c nor $base.yy.c generated."
+		echo "$base.c nor $base.yy.c nor lex.yy.c generated."
 		exit 1
 	fi
 fi
diff --git a/source4/build/make/yacc_compile.sh b/source4/build/make/yacc_compile.sh
index a56a51da0a..ac4afea3f6 100755
--- a/source4/build/make/yacc_compile.sh
+++ b/source4/build/make/yacc_compile.sh
@@ -29,10 +29,12 @@ if [ -r $DEST ]; then
 	fi
 fi
 TOP=`pwd`
+echo "info: running $YACC -d $file"
 if cd $dir && $YACC -d $file; then
 	if [ -r y.tab.h -a -r y.tab.c ];then
-		#echo "info: move files"
+		echo "info: move y.tab.h to $base.h"
 		sed -e "/^#/!b" -e "s|y\.tab\.h|$SRC|" -e "s|\"$base.y|\"$SRC|"  y.tab.h > $base.h
+		echo "info: move y.tab.c to $base.c"
 		sed -e "s|y\.tab\.c|$SRC|" -e "s|\"$base.y|\"$SRC|" y.tab.c > $base.c
 		rm -f y.tab.c y.tab.h
 	elif [ ! -r $base.h -a ! -r $base.c]; then