--- a/bake/Bake.py	Sun Oct 30 11:28:34 2011 +0100
+++ b/bake/Bake.py	Sun Oct 30 13:34:07 2011 +0100
@@ -113,8 +113,8 @@
                 if not module.get_build().attribute(name):
                     self._error('Module "%s" has no attribute "%s"' % (module_name, name))
                 if is_append:
-                    module.get_build().attribute(name).value = module.get_build().attribute(name) + \
-                        ' ' + value
+                    module.get_build().attribute(name).value = \
+                        module.get_build().attribute(name).value + ' ' + value
                 else:
                     module.get_build().attribute(name).value = value
             else:

--- a/bake/ModuleBuild.py	Sun Oct 30 11:28:34 2011 +0100
+++ b/bake/ModuleBuild.py	Sun Oct 30 13:34:07 2011 +0100
@@ -79,8 +79,8 @@
         self.add_attribute('CFLAGS',   '', 'Flags to use for C compiler')
         self.add_attribute('CXXFLAGS', '', 'Flags to use for C++ compiler')
         self.add_attribute('LDFLAGS',  '', 'Flags to use for Linker')
-        self.add_attribute('extra_configure_options',  '', 'Options to pass to "waf configure"')
-        self.add_attribute('extra_build_options',  '', 'Options to pass to "waf"')
+        self.add_attribute('configure_arguments',  '', 'Arguments to pass to "waf configure"')
+        self.add_attribute('build_arguments',  '', 'Arguments to pass to "waf"')
     @classmethod
     def name(cls):
         return 'waf'
@@ -107,13 +107,13 @@
                                  version_required = (1,6,0))
     def build(self, env, jobs):
         extra_configure_options = []
-        if self.attribute('extra_configure_options').value != '':
+        if self.attribute('configure_arguments').value != '':
             extra_configure_options = [env.replace_variables(tmp) for tmp in
-                                       self.attribute('extra_configure_options').value.split(' ')]
+                                       self.attribute('configure_arguments').value.split(' ')]
         extra_build_options = []
-        if self.attribute('extra_build_options').value != '':
+        if self.attribute('build_arguments').value != '':
             extra_build_options = [env.replace_variables(tmp) for tmp in
-                                   self.attribute('extra_build_options').value.split(' ')]
+                                   self.attribute('build_arguments').value.split(' ')]
         if self._is_1_6_x(env):
             env.run([self._binary(env.srcdir), '--top=' + env.srcdir, '--out=' + env.objdir, 
                      '--prefix=' + env.installdir, 'configure'] + extra_configure_options,
@@ -154,8 +154,8 @@
         self.add_attribute('CFLAGS',   '', 'Flags to use for C compiler')
         self.add_attribute('CXXFLAGS', '', 'Flags to use for C++ compiler')
         self.add_attribute('LDFLAGS',  '', 'Flags to use for Linker')
-        self.add_attribute('extra_targets', '', 'Targets to make before install')
-        self.add_attribute('extra_cmake_options', '', 'Command-line options to pass to cmake')
+        self.add_attribute('build_targets', '', 'Targets to make before install')
+        self.add_attribute('cmake_arguments', '', 'Command-line arguments to pass to cmake')
     @classmethod
     def name(cls):
         return 'cmake'
@@ -172,14 +172,14 @@
 
     def build(self, env, jobs):
         options = []
-        if self.attribute('extra_cmake_options').value != '':
-            options = self.attribute('extra_cmake_options').value.split(' ')
+        if self.attribute('cmake_arguments').value != '':
+            options = self.attribute('cmake_arguments').value.split(' ')
         env.run(['cmake', env.srcdir, '-DCMAKE_INSTALL_PREFIX=' + env.installdir] + 
                 self._variables() + options,
                 directory=env.objdir)
         env.run(['make', '-j', str(jobs)], directory = env.objdir)
-        if self.attribute('extra_targets').value != '':
-            env.run(['make'] + self.attribute('extra_targets').value.split(' '), 
+        if self.attribute('build_targets').value != '':
+            env.run(['make'] + self.attribute('build_targets').value.split(' '), 
                     directory = env.objdir)
         env.run(['make', 'install'], directory = env.objdir)
     def clean(self, env):
@@ -207,7 +207,7 @@
         self.add_attribute('CXXFLAGS', '', 'Flags to use for C++ compiler')
         self.add_attribute('LDFLAGS',  '', 'Flags to use for Linker')
         self.add_attribute('maintainer', 'no', 'Maintainer mode ?')
-        self.add_attribute('extra_configure_options', '', 'Command-line options to pass to configure')
+        self.add_attribute('configure_arguments', '', 'Command-line arguments to pass to configure')
     @classmethod
     def name(cls):
         return 'autotools'
@@ -222,8 +222,8 @@
             env.run(['autoreconf', '--install'], 
                     directory = env.srcdir)
         options = []
-        if self.attribute('extra_configure_options').value != '':
-            options = self.attribute('extra_configure_options').value.split(' ')
+        if self.attribute('configure_arguments').value != '':
+            options = self.attribute('configure_arguments').value.split(' ')
         env.run([os.path.join(env.srcdir, 'configure'),
                  '--prefix=' + env.installdir] + 
                 self._variables() + options,