Simplify handling of source directory in et compile wrapper.

(This used to be commit 4e6fddda2e7d9e37f7b7ec99c5a58671f825a571)

diff --git a/source4/heimdal_build/et_compile_wrapper.sh b/source4/heimdal_build/et_compile_wrapper.sh
index d7d47ba363fee296beaf5adaed3040079b392824..ec3b39ff560c2fe530c31ca786b924221450b398 100755 (executable)
--- a/source4/heimdal_build/et_compile_wrapper.sh
+++ b/source4/heimdal_build/et_compile_wrapper.sh
@@ -4,19 +4,13 @@
 SELF=$0
 SELFDIR=`dirname ${SELF}`
 
-SRCDIR=$1
-BUILDDIR=$2
-DESTDIR=$3
+BUILDDIR=$1
+DESTDIR=$2
 
-CMD=$4
-FILE=$5
-SOURCE=$6
-shift 6
-
-test -z "${SRCDIR}" && {
-       echo "${SELF}:SRCDIR: '${SRCDIR}'" >&2;
-       exit 1;
-}
+CMD=$3
+FILE=$4
+SOURCE=$5
+shift 5
 
 test -z "${BUILDDIR}" && {
        echo "${SELF}:BUILDDIR: '${BUILDDIR}'" >&2;
@@ -45,14 +39,6 @@ test -z "${SOURCE}" && {
 
 CURDIR=`pwd`
 
-cd ${SRCDIR} && {
-       ABS_SRCDIR=`pwd`
-       cd ${CURDIR}
-} || {
-       echo "${SELF}:cannot cd into '${SRCDIR}'" >&2;
-       exit 1;
-}
-
 cd ${BUILDDIR} && {
        ABS_BUILDDIR=`pwd`
        cd ${CURDIR}
@@ -62,7 +48,7 @@ cd ${BUILDDIR} && {
 }
 
 cd ${DESTDIR} && {
-       ${ABS_BUILDDIR}/${CMD} ${ABS_SRCDIR}/${FILE} >&2 || exit 1;
+       ${ABS_BUILDDIR}/${CMD} ${FILE} >&2 || exit 1;
        cd ${CURDIR}
        TMP="${SOURCE}.$$"
        mv ${SOURCE} ${TMP} && {

diff --git a/source4/heimdal_build/et_deps.pl b/source4/heimdal_build/et_deps.pl
index d341ecced37efe816baf529bd3c5917fe162fbcb..6a0485bb54a56a9a7ee5d26c18599cb75f8c03bf 100755 (executable)
--- a/source4/heimdal_build/et_deps.pl
+++ b/source4/heimdal_build/et_deps.pl
@@ -10,7 +10,7 @@ my $header = "$dirname/$basename"; $header =~ s/\.et$/.h/;
 my $source = "$dirname/$basename"; $source =~ s/\.et$/.c/;
 print "$header $source: \$(heimdalsrcdir)/$file \$(ET_COMPILER)\n";
 print "\t\@echo \"Compiling error table $file\"\n";
-print "\t\@\$(heimdalbuildsrcdir)/et_compile_wrapper.sh \$(srcdir) \$(builddir) $dirname \$(ET_COMPILER) \$(heimdalsrcdir)/$file $source\n\n";
+print "\t\@\$(heimdalbuildsrcdir)/et_compile_wrapper.sh \$(builddir) $dirname \$(ET_COMPILER) \$(abspath \$(heimdalsrcdir)/$file) $source\n\n";
 
 print "clean:: \n";
 print "\t\@rm -f $header $source\n\n";