--- trunk/mage/usr/lib/mage/mage.rc.global	2011/12/27 10:50:33	1552
+++ trunk/mage/usr/lib/mage/mage.rc.global	2011/12/27 11:00:16	1558
@@ -24,24 +24,27 @@
 # Set default user mage.rc
 : ${MAGERC="/etc/mage.rc"}
 
+# Distribution settings
+# Internal default: MAGE_DISTRIBUTION=stable
+# stable | testing | unstable
+: ${MAGE_DISTRIBUTION="stable"}
+
 # Default options
-PKGSUFFIX="mpk"
 VERBOSE="on"
 MAGEDEBUG="off"
-ARCH="i686"
 : ${MAGE_UNINSTALL_TIMEOUT="3"}
-PACKAGES_SERVER_PATH="packages/${ARCH}"
 
-# Default fetch options for rsync
-RSYNC_FETCH_OPTIONS="--recursive --links --perms --times --devices --timeout=600 --verbose --compress --progress --stats --delete --delete-after"
-
-# Default fetch options for wget
-WGET_FETCH_OPTIONS="--passive-ftp --tries 3 --continue --progress bar"
+# enables on-the-fly regeneration of the mage tree via smage2 files.
+# MAGE_TREE_DEST must be also set. You should set it to the same as MAGEDIR.
+#REGEN_MAGE_TREE=true
+MAGE_TREE_DEST="${MAGEDIR}"
 
-# Default build options
+# Arch specific options and build flags
+ARCH="i686"
 CHOST="${ARCH}-pc-linux-gnu"
 CFLAGS="-mtune=${ARCH} -O2 -pipe"
 CXXFLAGS="${CFLAGS}"
+LDFLAGS="-Wl,--as-needed"
 SMAGE_USE_CCACHE="false"
 SMAGE_USE_DISTCC="false"
 MAKEOPTS="-j2"
@@ -51,13 +54,20 @@
 STRIP_DYN_BIN="--strip-all"
 STRIP_STATIC_LIB="--strip-debug"
 
+# Extension defaults
+#  Do not modify these settings unless you know what you are doing
+PKGSUFFIX="mpk"
+SRCPKGSUFFIX="mpks"
+MAGESUFFIX="mage"
+SMAGESUFFIX="smage2"
+
 # Distcc specific settings
 #DISTCC_HOSTS=""
 DISTCC_DIR="${BUILDDIR}/.distcc"
 DISTCC_VERBOSE="0"
 DISTCC_LOG="/var/log/distcc.log"
 
-# Default mirrors
+# Default mirrors and download options
 MIRRORS="http://magellan-linux.de/magellan"
 GNU_MIRRORS="ftp://ftp.gnu.org/pub/gnu ftp://ftp.cs.tu-berlin.de/pub/gnu"
 SOURCEFORGE_MIRRORS="http://belnet.dl.sourceforge.net/sourceforge http://mesh.dl.sourceforge.net/sourceforge"
@@ -65,16 +75,12 @@
 KDE_MIRRORS="ftp://ftp.kde.org/pub/kde/stable ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.kde.org/pub/kde/stable"
 RSYNC="rsync://magellan-linux.de/mage-ix86"
 SMAGE2RSYNC="rsync://magellan-linux.de/smage-cvs"
+PACKAGES_SERVER_PATH="packages/${ARCH}"
 
-# Distribution settings
-# Internal default: MAGE_DISTRIBUTION=stable
-# stable | testing | unstable
-: ${MAGE_DISTRIBUTION="stable"}
-
-# enables on-the-fly regeneration of the mage tree via smage2 files.
-# MAGE_TREE_DEST must be also set. You should set it to the same as MAGEDIR.
-#REGEN_MAGE_TREE=true
-MAGE_TREE_DEST="${MAGEDIR}"
+# Default fetch options for rsync
+RSYNC_FETCH_OPTIONS="--recursive --links --perms --times --devices --timeout=600 --verbose --compress --progress --stats --delete --delete-after"
+# Default fetch options for wget
+WGET_FETCH_OPTIONS="--passive-ftp --tries 3 --continue --progress bar"
 
 # creates on-the-fly source-tarballs when building packages with smage2
 #CREATE_SRC_PKG_TARBALL=true