--- rules.orig	2002-11-27 20:34:35.000000000 +0000
+++ rules	2002-11-27 20:29:16.000000000 +0000
@@ -24,7 +24,7 @@
 TESTARCHS+=arm 
 TESTARCHS+=hppa 
 TESTARCHS+=hurd-i386 
-#TESTARCHS+=i386 
+TESTARCHS+=i386 
 TESTARCHS+=ia64 
 TESTARCHS+=m68k 
 TESTARCHS+=mips 
@@ -34,10 +34,11 @@
 TESTARCHS+=sh 
 TESTARCHS+=sparc
 
-autogen:
+autogen: autogen-stamp
+autogen-stamp:
 	./autogen.sh
 
-configure: configure-stamp
+configure: autogen configure-stamp
 configure-stamp:
 	dh_testdir
 
@@ -46,12 +47,8 @@
 	ln -s /usr/share/misc/config.sub ac-helpers/config.sub
 	ln -s /usr/share/misc/config.guess ac-helpers/config.guess
 
-	mkdir -p build-svn
-	
-	cd build-svn &&	../configure \
+	./configure \
 		$(confflags) \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
 		--with-apr=/usr \
 		--with-apr-util=/usr \
 		--with-neon=/usr \
@@ -59,53 +56,47 @@
 		--with-berkeley-db=/usr \
 		--with-apxs=/usr/bin/apxs2 \
 		--disable-mod-activation \
+		--with-python=/usr/bin/python \
 		--enable-debug
 		CFLAGS=-g
 
 	# Patch the generated libtool to avoid passing -rpath when linking,
 	# and to explicitly link libraries against the libraries they
 	# depend on.
-	sed < build-svn/libtool > build-svn/libtool-2 \
+	sed < libtool > libtool-2 \
 	-e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' \
 	-e '/^archive_cmds="/s/"$$/ \\$$deplibs"/' \
 	-e 's/^hardcode_into_libs.*$$/hardcode_into_libs=no/'
-	mv build-svn/libtool-2 build-svn/libtool
-	chmod 755 build-svn/libtool
+	mv libtool-2 libtool
+	chmod 755 libtool
 
 	touch configure-stamp
 
-build: configure-stamp build-stamp
+build: autogen-stamp configure-stamp build-stamp
 build-stamp:
 	dh_testdir
 
-	$(MAKE) -C build-svn
+	$(MAKE)
+	$(MAKE) swig-py-lib
 
 	touch build-stamp
 
 clean: autogen
 	dh_testdir
 	dh_testroot
-	rm -rf build-stamp configure-stamp 
+	rm -rf build-stamp configure-stamp autogen-stamp
 
 	rm -f ac-helpers/config.sub ac-helpers/config.guess
 
-	# remove files left behind by test suite
-	rm -f subversion/tests/clients/cmdline/svntest/main.pyc \
-		subversion/tests/clients/cmdline/svntest/__init__.pyc \
-		subversion/tests/clients/cmdline/svntest/actions.pyc \
-		subversion/tests/clients/cmdline/svntest/tree.pyc \
-		subversion/tests/clients/cmdline/svntest/wc.pyc \
-		subversion/tests/clients/cmdline/svntest/testcase.pyc \
-		subversion/tests/python-libs/exectest.pyc
+	-$(MAKE) clean
+	-$(MAKE) extraclean
 
 	# these are autogenerated as well
 	rm -f build/gen_base.pyc build/gen_make.pyc build/getversion.pyc
-	
-	-rm -rf build-svn
 
 	dh_clean
 
-INSTALL_PREFIX=$(PWD)/debian/tmp/usr
+INSTALL_PREFIX=$(PWD)/debian/tmp
 LIBEXECDIR=$(PWD)/debian/libapache2-dav-svn/usr/lib/apache2/modules
 
 install: build
@@ -115,7 +106,7 @@
 	dh_installdirs
 
 	$(MAKE) install INSTALL_MOD_SHARED=echo \
-		prefix=$(INSTALL_PREFIX) -C build-svn
+		DESTDIR=$(INSTALL_PREFIX)
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	# If we aren't cross-compiling we might run the testsuite
@@ -131,18 +122,17 @@
 	  echo "Running Testsuite, this may take a while, "      ;  \
 	  echo "edit debian/rules to disable"                    ;  \
 	  echo "################################################";  \
-	LD_LIBRARY_PATH="$(INSTALL_PREFIX)/lib:$(PWD)/build-svn/subversion/tests/.libs/" \
-		/usr/bin/time $(MAKE) -C build-svn check ; \
+	LD_LIBRARY_PATH="$(INSTALL_PREFIX)/usr/lib:$(PWD)/subversion/tests/.libs/" \
+		/usr/bin/time $(MAKE) check ; \
 	else \
 	  echo "################################################";  \
 	  echo "Testsuite disabled." ; \
 	  echo "################################################";  \
 	fi
 endif
-	$(MAKE) -C build-svn swig-py-ext \
-		prefix=$(INSTALL_PREFIX)
+	$(MAKE) swig-py-ext DESTDIR=$(INSTALL_PREFIX) SWIG_LDFLAGS=/usr/lib
 
-	$(MAKE) -C build-svn install-swig-py-ext prefix=$(INSTALL_PREFIX)
+	$(MAKE) install-swig-py-ext DESTDIR=$(INSTALL_PREFIX)
 
 	# Install files for 'python2.2-subversion' package
 	dh_movefiles --package=python2.2-subversion \
@@ -163,7 +153,7 @@
 	install -d debian/subversion/etc/subversion/
 	install -m 0644 debian/etc/config debian/etc/proxies \
 		debian/subversion/etc/subversion
-	
+
 	$(MAKE) -C doc/book install-book-html \
 		INSTALL_DIR=$(PWD)/debian/subversion/usr/share/doc/subversion
 
@@ -174,7 +164,7 @@
 	install -m 0644 tools/client-side/svn.vim \
 		tools/client-side/vc-svn.el \
 		debian/subversion/usr/share/doc/subversion/examples/
-	
+
 	install -m 0644 CHANGES \
 		debian/subversion/usr/share/doc/subversion/changelog
 
@@ -186,29 +176,29 @@
 	install -d debian/libapache2-dav-svn/etc/apache2/mods-available/
 	install -m 0644 debian/dav_svn.load debian/dav_svn.conf \
 		debian/libapache2-dav-svn/etc/apache2/mods-available/
-	
+
 	dh_movefiles --package=libsvn0 \
 		`cd debian/tmp ; ls usr/lib/libsvn_*-1.so.0*`
-	
+
 	dh_movefiles --package=libsvn0-dev \
 		usr/include \
 		usr/lib
-	
+
 	# install files for 'subversion-tools' package
 	install -d debian/subversion-tools/usr/bin/
 	install tools/cvs2svn/cvs2svn.py \
 		debian/subversion-tools/usr/bin/cvs2svn
-	
+
 	install -d debian/subversion-tools/usr/share/doc/subversion-tools/
 	install tools/client-side/svn_load_dirs.pl \
 		debian/subversion-tools/usr/bin/svn_load_dirs
 	install tools/client-side/svn_load_dirs.README \
 		debian/subversion-tools/usr/share/doc/subversion-tools/ \
-	
+
 	install -d debian/subversion-tools/usr/lib/subversion/
 	install tools/backup/hot-backup.py \
 		debian/subversion-tools/usr/lib/subversion/
-	
+
 
 # Build architecture-independent files here.
 binary-indep: build install