diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-12-25 21:36:22 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-12-25 21:36:22 (GMT) |
| commit | c9fa11dc5483cc571e855cf0d825944ae3d5c91c (patch) | |
| tree | 4eaee0565e466448ab5565bb6620d27e491918d7 | |
| parent | bb21e74a38f31c05913cffe80fd996c48803249b (diff) | |
Switch to forked version of automake
This speedups make install a lot by not compiling
python code. It's not necessary in our case because
user has access to the installation path.
| -rw-r--r-- | config/config.json | 2 | ||||
| -rw-r--r-- | config/modules/system.json | 5 | ||||
| -rw-r--r-- | devbot/environ.py | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/config/config.json b/config/config.json index 126e679..caa5d5d 100644 --- a/config/config.json +++ b/config/config.json @@ -1,3 +1,3 @@ { - "full_build": "1" + "full_build": "2" } diff --git a/config/modules/system.json b/config/modules/system.json index 1adb282..4f1b978 100644 --- a/config/modules/system.json +++ b/config/modules/system.json @@ -1,5 +1,10 @@ [ { + "branch": "v1.12.6", + "name": "automake", + "repo": "git://github.com/dnarvaez/automake.git" + }, + { "branch": "gnome-3-4", "if": "gnome_version == '3.4'", "name": "gnome-keyring", diff --git a/devbot/environ.py b/devbot/environ.py index a2a2a5b..e90b174 100644 --- a/devbot/environ.py +++ b/devbot/environ.py @@ -25,8 +25,6 @@ def _setup_variables(): add_path("LD_LIBRARY_PATH", config.lib_dir) add_path("PATH", config.bin_dir) - add_path("ACLOCAL_PATH", - os.path.join(config.share_dir, "aclocal")) add_path("XCURSOR_PATH", os.path.join(config.share_dir, "icons")) add_path("PKG_CONFIG_PATH", @@ -41,6 +39,9 @@ def _setup_variables(): add_path("PYTHONPATH", os.path.dirname(os.path.dirname(__file__))) + add_path("ACLOCAL_PATH", "/usr/share/aclocal") + add_path("ACLOCAL_FLAGS", "-I /usr/share/aclocal") + add_path("XDG_DATA_DIRS", "/usr/share") add_path("XDG_DATA_DIRS", config.share_dir) |