merge fixes from trunk
[openwrt/svn-archive/archive.git] / package / openssl / patches / 120-makedepend.patch
1 diff -burN openssl-0.9.8k/util/domd openssl-0.9.8k.patched/util/domd
2 --- openssl-0.9.8k/util/domd 2009-01-21 22:44:52.000000000 +0100
3 +++ openssl-0.9.8k.patched/util/domd 2009-03-26 15:46:28.600347986 +0100
4 @@ -14,7 +14,8 @@
5 cp Makefile Makefile.save
6 # fake the presence of Kerberos
7 touch $TOP/krb5.h
8 -if [ "$MAKEDEPEND" = "gcc" ]; then
9 +D=${MAKEDEPEND/%*gcc/gcc}
10 +if [ "$D" = "gcc" ]; then
11 args=""
12 while [ $# -gt 0 ]; do
13 if [ "$1" != "--" ]; then args="$args $1"; fi
14 @@ -22,7 +23,7 @@
15 done
16 sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp
17 echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
18 - ${CC:-gcc} -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp
19 + ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp
20 ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new
21 rm -f Makefile.tmp
22 else