From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 15 Nov 2008 18:03:11 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
X-Git-Tag: v3.0-alpha1~457
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1cba03a1306423f7343b59b6b3268e4f00a27f5d;p=ipfire-3.x.git

Merge branch 'master' of git://git.ipfire.org/ipfire-3.x

Conflicts:

	tools/make-constants
---

1cba03a1306423f7343b59b6b3268e4f00a27f5d
diff --cc tools/make-constants
index 477b2faac,3f3fc6281..c9ca5066f
--- a/tools/make-constants
+++ b/tools/make-constants
@@@ -25,8 -25,8 +25,8 @@@
  ###############################################################################
  
  # Default target
- TARGET=i686
+ TARGET=${TARGET-i686}
 -POSSIBLE_TARGETS="i586 i686 via-c3 via-c7 geodelx"
 +POSSIBLE_TARGETS="i486 i586 i686 via-c3 via-c7 geodelx"
  
  # Configuration rootdir
  CONFIG_ROOT=/etc/$SNAME