Merge from etch branch.

[software/mutt-debian.git] / debian / update-autotools.sh

diff --git a/debian/update-autotools.sh b/debian/update-autotools.sh
old mode 100644 (file)
new mode 100755 (executable)
index 4f5fc40..f161b02
--- a/debian/update-autotools.sh
+++ b/debian/update-autotools.sh
@@ -2,23 +2,37 @@
 
 set -e
 
 
 set -e
 

-diff="${1-debian/patches/autotools-update}"
-rm -f "$diff"
-

 dh_testdir
 dh_testdir

+
+D=$(basename "$PWD")
+PATCH_NAME=misc/autotools-update.diff 
+

 debclean
 debclean

-make -f debian/sys-build.mk source.patch
-cd build-tree
+quilt delete $PATCH_NAME || test $? -eq 1
+quilt push -aq
+ln -sf /usr/share/misc/config.sub .
+ln -sf /usr/share/misc/config.guess .

 
 

-D=`echo *`
+cd ..

 cp -al $D $D.orig
 
 cd $D 
 aclocal -I m4
 autoheader
 cp -al $D $D.orig
 
 cd $D 
 aclocal -I m4
 autoheader

-(cd m4 && make -f Makefile.am.in )
+( cd m4 && make -f Makefile.am.in )

 automake
 autoconf
 cd ..
 
 automake
 autoconf
 cd ..
 

-diff -ru $D.orig $D >"../$diff"
+T=`mktemp $D/diff.XXXXXX`
+diff -ru $D.orig $D >$T || test $? -eq 1
+patch -p1 -R -d $D <$T
+
+cd $D
+quilt import -f -P $PATCH_NAME `basename $T`
+quilt push
+quilt refresh -p0
+cd ..
+
+rm -f $T
+rm -rf $D.orig