Standardise on prefix instead of installprefix.

pull/15/head
Jussi Pakkanen 11 years ago
parent b33c55bba0
commit b8f6c3f39c
  1. 4
      mesonconf.py
  2. 2
      optinterpreter.py

@ -90,7 +90,7 @@ class Conf:
self.coredata.use_pch = self.tobool(v)
elif k == 'unity':
self.coredata.unity = self.tobool(v)
elif k == 'installprefix':
elif k == 'prefix':
if not os.path.isabs(v):
raise ConfException('Install prefix %s is not an absolute path.' % v)
self.coredata.prefix = v
@ -175,7 +175,7 @@ class Conf:
print('')
print('Directories\n')
parr = []
parr.append(['installprefix', 'Install prefix', self.coredata.prefix])
parr.append(['prefix', 'Install prefix', self.coredata.prefix])
parr.append(['libdir', 'Library directory', self.coredata.libdir])
parr.append(['bindir', 'Binary directory', self.coredata.bindir])
parr.append(['includedir', 'Header directory', self.coredata.includedir])

@ -21,7 +21,7 @@ forbidden_option_names = {'type': True,
'coverage': True,
'pch': True,
'unity': True,
'installprefix': True,
'prefix': True,
'libdir' : True,
'bindir' : True,
'includedir' : True,

Loading…
Cancel
Save