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

[pelle at users.alioth.debian.org]

Author: pelle
Date: Thu Oct 25 19:46:42 2007
New Revision: 386

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=386
Log:
revert r384, build-tree works better after all

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=386&op=diff
==============================================================================
--- lyx/trunk/debian/changelog (original)
+++ lyx/trunk/debian/changelog Thu Oct 25 19:46:42 2007
@@ -7,8 +7,6 @@
   * Recommend evince as PS/PDF viewer. It's quite good, and KDE users
     will already have alternatives installed.
   * CFLAGS -> CXXFLAGS in debian/rules.
-  * Stop using separate build-tree directory, as it's not done by
-    upstream (.pyc files aren't cleaned etc.).
   * Don't replace config.guess (not needed), and clean up debian/rules a
     bit.
 

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