* Add mipseb to the archtable too, since mips and mipseb are

    both viable names for the mips big endian arch
  * Update dpkg-architecure's archtable
  * Removed the maintainer-configure portion in debian/rules, since
    we should be shipping the source with all the auto* stuff
    already generated anyway
  * Removed the ltconfig patch, and resort to a debian/rules fix
    to libtool itself after running configure, much cleaner, and
    reversible since libtool is a generated file
  * Use DESTDIR when installing instead of specifying all our
    dest dirs seperately in the make line. Also fix some of the
    make files to use DESTDIR when installing files
  * Regenerated .po files and dpkg.pot. Also added update.sh to the po/
    subdir for easier regenerating for cvs only
  * Make release.sh generate .gmo files
  * Removed shlibs.default.i386. This is an obsolete file. We also no
    longer use /etc/dpkg/ directory.

1 files changed, 12 insertions, 28 deletions

diff --git a/debian/rules b/debian/rules
index bcbea7d98..bb88af987 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,34 +4,18 @@ SHELL=bash
 
 .PHONY: clean build binary binary-trees binary-arch binary-indep
 
-BUILD := $(shell pwd)/debian/build
+BUILD := $(shell pwd)/build
 DIR := $(shell pwd)
 
 arch=$(shell dpkg --print-architecture)
 mcidir=debian/tmp-main/DEBIAN
 
 
-configure: Makefile.am configure.in
+$(BUILD)/config.status:
 	$(checkdir)
-	mkdir -p automake
-	aclocal -I ./automake
-	autoheader
-	gettextize --copy --force
-	libtoolize --copy --force
-	patch -p0 < debian/ltconfig-1.3.2.diff
-	automake --copy --add-missing --foreign
-	autoconf
-	cd utils ; \
-		aclocal -I ../automake ; \
-		autoheader ; \
-		automake --foreign ; \
-		autoconf
-
-$(BUILD)/config.status: configure
-	$(checkdir)
-	$(RM) -r debian/build
-	install -d debian/build
-	cd $(BUILD) && ../../configure \
+	$(RM) -r $(BUILD)
+	install -d $(BUILD)
+	cd $(BUILD) && $(DIR)/configure \
 		--enable-shared \
 		--prefix=/usr \
 		--datadir=/usr/share \
@@ -39,7 +23,12 @@ $(BUILD)/config.status: configure
 		--infodir=/usr/share/info \
 		--sysconfdir=/etc \
 		--sharedstatedir=/var/lib \
-		--localstatedir=/var/lib
+		--localstatedir=/var/lib && \
+	    sed < libtool > libtool-2 \
+	    -e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__NO_RPATH_PLEASE "/' \
+	    -e '/^archive_cmds="/s/"$$/ \\$$deplibs"/' && \
+	    mv -f libtool-2 libtool && \
+	    chmod 755 libtool
 
 clean:
 	$(checkdir)
@@ -59,7 +48,7 @@ binary: binary-arch binary-indep
 binary-trees: build
 	$(checkdir)
 	-$(RM) -r debian/tmp-{main,dev}
-	install -d debian/tmp-{main,dev}/{DEBIAN,etc/dpkg,usr/share/doc/dpkg}
+	install -d debian/tmp-{main,dev}/{DEBIAN,etc,usr/share/doc/dpkg}
 	install -d debian/tmp-dev/usr/{lib/dpkg,share/doc/dpkg-dev,sbin,bin}
 	install -d debian/tmp-dev/usr/share/man/{ja/man1,man1,ja/man8,man8}
 	install -d debian/tmp-dev/usr/share/emacs/site-lisp/dpkg-dev
@@ -69,11 +58,6 @@ binary-trees: build
 	else \
 		sed -e '/^# i386elf: /d' debian/preinst >$(mcidir)/preinst ; \
 	fi
-	set -e; if [ -f debian/shlibs.default.$(arch) ]; then \
-		echo /etc/dpkg/shlibs.default >debian/tmp-dev/DEBIAN/conffiles ; \
-		cp debian/shlibs.default.$(arch) \
-			debian/tmp-dev/etc/dpkg/shlibs.default ; \
-	fi
 	cp debian/{prerm,postinst} $(mcidir)/.
 	$(MAKE) -C $(BUILD) top_distdir=. dist 
 	$(MAKE) -C $(BUILD) \