debian/changelog | 7 +++++++
debian/rules | 18 +++++++++---------
2 files changed, 16 insertions(+), 9 deletions(-)
New commits:
commit 1732124a6a58acc904d0ca32cd99fa942371c5a9
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 16 16:48:56 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 0eb9456..02f6b78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxfont (1:1.4.1-2) UNRELEASED; urgency=low
+
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
+
+ -- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:42 +0000
+
libxfont (1:1.4.1-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/rules b/debian/rules
index c1e4caf..89cd2f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,8 +33,8 @@ endif
doc_files = \
doc/fontlib.css \
- obj-$(DEB_BUILD_GNU_TYPE)/doc/fontlib.txt \
- obj-$(DEB_BUILD_GNU_TYPE)/doc/fontlib.html
+ build/doc/fontlib.txt \
+ build/doc/fontlib.html
confflags += \
--with-bzip2 \
@@ -47,18 +47,18 @@ confflags += \
configure: $(STAMP_DIR)/patch
autoreconf -vfi
-obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
- mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
- cd obj-$(DEB_BUILD_GNU_TYPE) && \
+build/config.status: configure
+ mkdir -p build
+ cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)" LDFLAGS=""
build: build-stamp
-build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
+build-stamp: build/config.status
dh_testdir
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
>$@
clean: xsfclean
@@ -70,7 +70,7 @@ clean: xsfclean
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 $$(find -name Makefile.in)
rm -f aclocal.m4 config.guess config.h.in config.sub configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
@@ -83,7 +83,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
