1.1 --- a/setup.py	Sat Feb 14 12:13:04 2009 +0000
     1.2 +++ b/setup.py	Sat Feb 14 12:13:51 2009 +0000
     1.3 @@ -6,7 +6,7 @@
     1.4  os.chdir(setupdir)
     1.5  
     1.6  name='minitage.recipe'
     1.7 -version = '0.2'
     1.8 +version = '0.4'
     1.9  
    1.10  def read(rnames):
    1.11      return open(

     2.1 --- a/src/minitage/recipe/common/__init__.py	Sat Feb 14 12:13:04 2009 +0000
     2.2 +++ b/src/minitage/recipe/common/__init__.py	Sat Feb 14 12:13:51 2009 +0000
     2.3 @@ -90,7 +90,7 @@
     2.4              os.path.join(self.buildout['buildout']['directory'], '..', '..')
     2.5          )
     2.6          # destination
     2.7 -        options['location'] = options.get('location', 
     2.8 +        options['location'] = options.get('location',
     2.9                                            os.path.join(
    2.10                                                buildout['buildout']['parts-directory'],
    2.11                                                options.get('name', self.name)
    2.12 @@ -104,7 +104,8 @@
    2.13          self.prefix_separator = options.get('prefix-separator', '=')
    2.14          if self.prefix_separator == '':
    2.15              self.prefix_separator = ' '
    2.16 -
    2.17 +        self.prefix_option = self.options.get('prefix-option',
    2.18 +                                              '--prefix%s' % self.prefix_separator)
    2.19          # if we are installing in minitage, try to get the
    2.20          # minibuild name and object there.
    2.21          self.str_minibuild = os.path.split(self.cwd)[1]
    2.22 @@ -427,9 +428,9 @@
    2.23          os.chdir(self.build_dir)
    2.24          if not 'noconfigure' in self.options:
    2.25              self._system(
    2.26 -                    '%s --prefix%s%s %s' % (
    2.27 +                    '%s %s%s %s' % (
    2.28                          configure,
    2.29 -                        self.prefix_separator,
    2.30 +                        self.prefix_option,
    2.31                          self.prefix,
    2.32                          self.configure_options
    2.33                      )
    2.34 @@ -550,7 +551,7 @@
    2.35      def _set_path(self):
    2.36          """Set path."""
    2.37          self.logger.info('Setting path')
    2.38 -        os.environ['PATH'] = appendVar(os.environ['PATH'], 
    2.39 +        os.environ['PATH'] = appendVar(os.environ['PATH'],
    2.40                       self.path\
    2.41                       + [self.buildout['buildout']['directory'],
    2.42                          self.options['location']]\
    2.43 @@ -584,7 +585,7 @@
    2.44                  # to get the new rpath feature present
    2.45                  # >= osx Leopard
    2.46                  darwin_ldflags = ' -mmacosx-version-min=10.5.0 '
    2.47 -            
    2.48 +
    2.49              os.environ['LDFLAGS'] = appendVar(
    2.50                  os.environ.get('LDFLAGS',''),
    2.51                  ['-L%s -Wl,-rpath -Wl,%s' % (s,s) \
    2.52 @@ -593,7 +594,7 @@
    2.53                  + [darwin_ldflags] ,
    2.54                  ' '
    2.55              )
    2.56 -            
    2.57 +
    2.58              if self.uname == 'cygwin':
    2.59                  os.environ['LDFLAGS'] = ' '.join(
    2.60                      [os.environ['LDFLAGS'],
    2.61 @@ -641,7 +642,7 @@
    2.62                   if s.strip()]
    2.63                  ,' '
    2.64              )
    2.65 -            
    2.66 +
    2.67  
    2.68      def _unpack(self, fname, directory=None):
    2.69          """Unpack something"""