Support make-command and make-options.

Fix configure-command.

slapos/recipe/build.py

@@ -363,15 +363,21 @@ url = self.download(self.options['url'], self.options.get('md5sum'))
 extract_dir = self.extract(url)
 workdir = guessworkdir(extract_dir)
 configure_command = self.options.get('configure-command')
-if configure_command is None:
-  configure_command = ["./configure", "--prefix=%(location)s"] + [%(configure-options)r.split()]
+if configure_command is None or configure_command.lower() == 'None':
+  configure_command = ["./configure", "--prefix=%(location)s"] + %(configure-options)r.split()
+else:
+  configure_command = configure_command.split(' ')
 self.logger.info('Configuring with: %%s' %% configure_command)
 self.applyPatchList(self.options.get('patches'), self.options.get('patch-options'), self.options.get('patch-binary'), workdir)
 call(configure_command, cwd=workdir, env=env)
-self.logger.info('Building')
-call("make", cwd=workdir, env=env)
+make_command = [self.options.get('make-binary', "make")]
+make_options = self.options.get('make-options')
+if make_options is not None:
+  make_command.extend(make_options.split(' '))
+self.logger.info('Building with %%r' %% make_command)
+call(make_command, cwd=workdir, env=env)
 self.logger.info('Installing')
-call(["make", "install"], cwd=workdir, env=env)
+call(make_command + ['install'], cwd=workdir, env=env)
 """
 
   def __init__(self, buildout, name, options):