debian/changelog | 5 +++++
debian/rules | 10 +++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 6be6e2c19a14ce91f1dac2d23ca68e8851c1fc91
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 16 16:48:57 2010 +0000
Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good
reason. Thanks, Colin Watson!
diff --git a/debian/changelog b/debian/changelog
index 03aa6b6..a548aea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
libfontenc (1:1.0.5-2) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* Drop pre-dependency on x11-common from libfontenc-dev. This was needed
for upgrades from sarge.
+ [ Julien Cristau ]
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
+
-- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 24 Nov 2009 13:22:53 +0200
libfontenc (1:1.0.5-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index c15e04e..d956018 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,13 +37,13 @@ build: build-stamp
build-stamp:
dh_testdir
autoreconf -vfi
- mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
- cd obj-$(DEB_BUILD_GNU_TYPE) && \
+ mkdir -p build
+ cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
--with-encodingsdir=\$${datadir}/fonts/X11/encodings \
CFLAGS="$(CFLAGS)"
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
>$@
clean:
@@ -55,7 +55,7 @@ clean:
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
- rm -rf obj-*
+ rm -rf build
rm -f INSTALL aclocal.m4 config.guess config.h.in config.sub configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
find -name Makefile.in -delete
@@ -68,7 +68,7 @@ install: build
dh_clean -k
dh_installdirs
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install
+ cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-dependent files here.
binary-arch: build install
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
