[Pkg-lyx-devel] svn commit: r384 - in /lyx/trunk/debian: changelog rules

[pelle at users.alioth.debian.org]

Author: pelle
Date: Thu Oct 25 18:25:07 2007
New Revision: 384

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=384
Log:
* Stop using separate build-tree directory, as it's not done by
  upstream (.pyc files aren't cleaned etc.).

Modified:
    lyx/trunk/debian/changelog
    lyx/trunk/debian/rules

Modified: lyx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/changelog?rev=384&op=diff
==============================================================================
--- lyx/trunk/debian/changelog (original)
+++ lyx/trunk/debian/changelog Thu Oct 25 18:25:07 2007
@@ -7,8 +7,10 @@
   * Recommend evince as PS/PDF viewer. It's quite good, and KDE users
     will already have alternatives installed.
   * CFLAGS -> CXXFLAGS in debian/rules.
-
- -- Per Olofsson <pelle at debian.org>  Thu, 25 Oct 2007 20:18:04 +0200
+  * Stop using separate build-tree directory, as it's not done by
+    upstream (.pyc files aren't cleaned etc.).
+
+ -- Per Olofsson <pelle at debian.org>  Thu, 25 Oct 2007 20:24:43 +0200
 
 lyx (1.5.1-2) unstable; urgency=low
 

Modified: lyx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/rules?rev=384&op=diff
==============================================================================
--- lyx/trunk/debian/rules (original)
+++ lyx/trunk/debian/rules Thu Oct 25 18:25:07 2007
@@ -58,16 +58,15 @@
 	[ -f config/config.guess ] \
 		|| ln -s /usr/share/misc/config.guess config/config.guess
 
-	test -d build-tree || mkdir build-tree
-	cd build-tree && CXXFLAGS="$(CXXFLAGS)" \
-		LDFLAGS="$(LDFLAGS)" ../configure $(CONFIGURE_OPTIONS)
+	CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" \
+		./configure $(CONFIGURE_OPTIONS)
 
 	touch configure-stamp
 
 build: configure build-stamp
 build-stamp:
 	dh_testdir
-	cd build-tree && $(MAKE)
+	$(MAKE)
 	touch build-stamp
 
 clean: clean1 unpatch
@@ -75,13 +74,11 @@
 	dh_testdir
 	dh_testroot
 
+	! [ -f Makefile ] || $(MAKE) distclean
+
 	rm -f build-stamp configure-stamp
-	rm -rf build-tree
 	mv config/config.guess.backup config/config.guess || true
 	mv config/config.sub.backup config/config.sub || true
-
-# temporary hack since these files are not removed
-	find lib -name '*.pyc' -exec rm {} \;
 
 	dh_clean
 
@@ -90,7 +87,7 @@
 	dh_testroot
 	dh_clean -k
 
-	cd build-tree && $(MAKE) install DESTDIR=`pwd`/../debian/lyx-common/
+	$(MAKE) install DESTDIR=`pwd`/debian/lyx-common/
 
 	dh_installdirs
 	dh_install