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

[pelle at users.alioth.debian.org]

Author: pelle
Date: Thu Oct 25 18:41:24 2007
New Revision: 385

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=385
Log:
* Don't replace config.guess (not needed), and clean up debian/rules a
  bit.

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=385&op=diff
==============================================================================
--- lyx/trunk/debian/changelog (original)
+++ lyx/trunk/debian/changelog Thu Oct 25 18:41:24 2007
@@ -9,8 +9,10 @@
   * CFLAGS -> CXXFLAGS in debian/rules.
   * 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
+  * Don't replace config.guess (not needed), and clean up debian/rules a
+    bit.
+
+ -- Per Olofsson <pelle at debian.org>  Thu, 25 Oct 2007 20:41:06 +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=385&op=diff
==============================================================================
--- lyx/trunk/debian/rules (original)
+++ lyx/trunk/debian/rules Thu Oct 25 18:41:24 2007
@@ -48,15 +48,10 @@
 configure-stamp:
 	dh_testdir
 
-	[ -f config/config.sub.backup ] \
-		|| mv config/config.sub config/config.sub.backup
-	[ -f config/config.sub ] \
-		|| ln -s /usr/share/misc/config.sub config/config.sub
-
-	[ -f config/config.guess.backup ] \
-		|| mv config/config.guess config/config.guess.backup
-	[ -f config/config.guess ] \
-		|| ln -s /usr/share/misc/config.guess config/config.guess
+	set -e; if ! [ -f config/config.sub.backup ]; then \
+		mv config/config.sub config/config.sub.backup; \
+		ln -s /usr/share/misc/config.sub config/config.sub; \
+	fi
 
 	CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" \
 		./configure $(CONFIGURE_OPTIONS)
@@ -77,8 +72,8 @@
 	! [ -f Makefile ] || $(MAKE) distclean
 
 	rm -f build-stamp configure-stamp
-	mv config/config.guess.backup config/config.guess || true
-	mv config/config.sub.backup config/config.sub || true
+	! [ -f config/config.sub.backup ] || \
+		mv config/config.sub.backup config/config.sub
 
 	dh_clean