PR: 1963

[openssl.git] / util / domd

diff --git a/util/domd b/util/domd
index 691be7a440ac8295930d1b9e7194dc53e6281a10..bab48cb7a27e14477c4805b519f0e4c208370795 100755 (executable)
--- a/util/domd
+++ b/util/domd
@@ -14,7 +14,7 @@ if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi
 cp Makefile Makefile.save
 # fake the presence of Kerberos
 touch $TOP/krb5.h
 cp Makefile Makefile.save
 # fake the presence of Kerberos
 touch $TOP/krb5.h

-if [ "$MAKEDEPEND" = "gcc" ]; then
+if expr "$MAKEDEPEND" : '.*gcc$' > /dev/null; then

     args=""
     while [ $# -gt 0 ]; do
        if [ "$1" != "--" ]; then args="$args $1"; fi
     args=""
     while [ $# -gt 0 ]; do
        if [ "$1" != "--" ]; then args="$args $1"; fi


@@ -22,13 +22,17 @@ if [ "$MAKEDEPEND" = "gcc" ]; then
     done
     sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp
     echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
     done
     sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp
     echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp

-    gcc -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp
+    ${MAKEDEPEND} -Werror -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp || exit 1

     ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new
     ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new

+    RC=$?

     rm -f Makefile.tmp
 else
     rm -f Makefile.tmp
 else

-    ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@
+    ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@ && \

     ${PERL} $TOP/util/clean-depend.pl < Makefile > Makefile.new
     ${PERL} $TOP/util/clean-depend.pl < Makefile > Makefile.new

+    RC=$?

 fi
 mv Makefile.new Makefile
 # unfake the presence of Kerberos
 rm $TOP/krb5.h
 fi
 mv Makefile.new Makefile
 # unfake the presence of Kerberos
 rm $TOP/krb5.h

+
+exit $RC