Move DOCDIR below definition of MDATADIR

This commit is contained in:
Christian Dywan 2009-06-06 21:41:26 +02:00
parent 2cae1a797f
commit 71a4daa605

View file

@ -110,7 +110,6 @@ def configure (conf):
Utils.pprint ('BLUE', 'Mingw recognized, assuming chross compile.') Utils.pprint ('BLUE', 'Mingw recognized, assuming chross compile.')
dirname_default ('DOCDIR', os.path.join (conf.env['DATADIR'], 'doc'))
dirname_default ('LIBDIR', os.path.join (conf.env['PREFIX'], 'lib')) dirname_default ('LIBDIR', os.path.join (conf.env['PREFIX'], 'lib'))
if conf.env['PREFIX'] == '/usr': if conf.env['PREFIX'] == '/usr':
dirname_default ('SYSCONFDIR', '/etc') dirname_default ('SYSCONFDIR', '/etc')
@ -120,6 +119,7 @@ def configure (conf):
# Use MDATADIR because DATADIR is a constant in objidl.h on Windows # Use MDATADIR because DATADIR is a constant in objidl.h on Windows
'MDATADIR') 'MDATADIR')
conf.undefine ('DATADIR') conf.undefine ('DATADIR')
dirname_default ('DOCDIR', os.path.join (conf.env['MDATADIR'], 'doc'))
if option_enabled ('apidocs'): if option_enabled ('apidocs'):
conf.find_program ('gtkdoc-scan', var='GTKDOC_SCAN') conf.find_program ('gtkdoc-scan', var='GTKDOC_SCAN')