diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2013-03-19 20:22:13 +0100 |
|---|---|---|
| committer | Andoni Morales Alastruey <ylatuya@gmail.com> | 2013-03-19 20:22:13 +0100 |
| commit | 8694f61698602588ca619c64750fb63f197d4467 (patch) | |
| tree | 7cc21f07362872d2b13e68890d83c9b7f0aa67d8 | |
| parent | ffb7fffdad88a12a9fc24e5130b2b7e6dc3b40b5 (diff) | |
config: include aclocal folder from the build tools too
| -rw-r--r-- | cerbero/config.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cerbero/config.py b/cerbero/config.py index 9d81ec5..023ee01 100644 --- a/cerbero/config.py +++ b/cerbero/config.py @@ -172,7 +172,8 @@ class Config (object): xdgconfigdir = os.path.join(prefix, 'etc', 'xdg') xcursordir = os.path.join(prefix, 'share', 'icons') aclocaldir = os.path.join(prefix, 'share', 'aclocal') - aclocal = "%s -I%s" % ('aclocal', aclocaldir) + build_aclocaldir = os.path.join(self.build_tools_prefix, 'share', 'aclocal') + aclocal = "%s -I%s -I%s" % ('aclocal', aclocaldir, build_aclocaldir) perlversionpath = os.path.join(libdir, 'perl5', 'site_perl', self._perl_version()) if self.target_platform == Platform.WINDOWS: @@ -222,7 +223,7 @@ class Config (object): 'XDG_DATA_DIRS': xdgdatadir, 'XDG_CONFIG_DIRS': xdgconfigdir, 'XCURSOR_PATH': xcursordir, - 'ACLOCAL_FLAGS': '-I %s' % aclocaldir, + 'ACLOCAL_FLAGS': '-I %s -I %s' % (aclocaldir, build_aclocaldir), 'ACLOCAL': aclocal, 'PERL5LIB': perl5lib, 'GST_PLUGIN_PATH': gstpluginpath, |