jcarr
/
x11-xserver-utils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson!

This commit is contained in:
Julien Cristau 2010-01-16 16:48:38 +00:00
parent c6e81d90a7
commit bb6f4c6e7b
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
x11-xserver-utils (7.5+2) UNRELEASED; urgency=low
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:13 +0000
x11-xserver-utils (7.5+1) unstable; urgency=low x11-xserver-utils (7.5+1) unstable; urgency=low
[ Julien Cristau ] [ Julien Cristau ]

10
debian/rules vendored
View File

@ -45,15 +45,15 @@ build-stamp: $(BUILD_STAMPS)
$(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
dh_testdir dh_testdir
mkdir -p $*-obj-$(DEB_BUILD_GNU_TYPE) mkdir -p $*-build
cd $*-obj-$(DEB_BUILD_GNU_TYPE) && \ cd $*-build && \
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \ ../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \ --infodir=\$${prefix}/share/info $(confflags) \
--disable-xprint \ --disable-xprint \
CFLAGS="$(CFLAGS)" \ CFLAGS="$(CFLAGS)" \
RSH=rsh \ RSH=rsh \
MANCONF="/etc/manpath.config" MANCONF="/etc/manpath.config"
cd $*-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) cd $*-build && $(MAKE)
>$@ >$@
clean: xsfclean clean: xsfclean
@ -65,7 +65,7 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest* rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache rm -rf autom4te.cache */autom4te.cache
rm -rf *-obj-* rm -rf *-build
dh_clean dh_clean
@ -76,7 +76,7 @@ install: build
dh_installdirs dh_installdirs
for FILE in $(SUBDIRS); do \ for FILE in $(SUBDIRS); do \
cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \ cd "$$FILE"-build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \
cd ..; \ cd ..; \
done done