[Pkg-mysql-commits] r1273 - trunk/debian

[Norbert Tretkowski]

tags 485971 pending
thanks

Author: nobse
Date: 2008-06-21 13:11:44 +0000 (Sat, 21 Jun 2008)
New Revision: 1273

Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
Really fix build on non-linux systems, this time without producing a build error on some architectures.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-06-21 12:49:38 UTC (rev 1272)
+++ trunk/debian/changelog	2008-06-21 13:11:44 UTC (rev 1273)
@@ -3,6 +3,8 @@
   * New patch 80_fix_user_setup_on_localhost.dpatch from Daniel Hahler to fix
     a duplicate key error when install MySQL server on a host with hostname
     localhost. (closes: #478319)
+  * Really fix build on non-linux systems, this time without producing a build
+    error on some architectures. (closes: #485971)
   * Update debconf translations:
     - French, from Christian Perrier. (closes: #478553)
     - German, from Alwin Meschede. (closes: #478672)
@@ -18,7 +20,7 @@
     - Romanian, from Eddy Petrișor. (closes: #486944)
     - Japanese, Hideki Yamane. (closes: #487270)
 
- -- Norbert Tretkowski <nobse at debian.org>  Sat, 21 Jun 2008 14:19:11 +0200
+ -- Norbert Tretkowski <nobse at debian.org>  Sat, 21 Jun 2008 15:07:45 +0200
 
 mysql-dfsg-5.0 (5.0.51a-7) unstable; urgency=high
 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-06-21 12:49:38 UTC (rev 1272)
+++ trunk/debian/rules	2008-06-21 13:11:44 UTC (rev 1273)
@@ -22,7 +22,7 @@
 
 DISTRIBUTION = $(shell lsb_release -i -s)
 
-MAKE_J = -j$(shell grep -c processor.* /proc/cpuinfo || echo 1)
+MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)
 ifeq (${MAKE_J}, -j0)
   MAKE_J = -j1
 endif