onefang pushed a commit to branch master.
commit b9b187bf833941a0575db32bcddf7c769ab2bba4
Author: David Walter Seikel <[email protected]>
Date: Fri May 24 13:53:09 2013 +1000
Check for Makefile after checking for build systems that might create it.
---
onefang/build_efl.lua | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/onefang/build_efl.lua b/onefang/build_efl.lua
index 4ba2f8c..8c29198 100755
--- a/onefang/build_efl.lua
+++ b/onefang/build_efl.lua
@@ -143,9 +143,6 @@ local function build(i, package)
if good then good = runBuildCommand(i, package, path, './perl
Makefile.PL prefix=' .. installPath) end
if good then good = runBuildCommand(i, package, path, 'make -j'
.. threads) end
if good then good = runBuildCommand(i, package, path, 'sudo
make install') end
- elseif fileExists(path .. '/Makefile') then
- if good then good = runBuildCommand(i, package, path, 'make
PREFIX=' .. installPath .. ' -j' .. threads) end
- if good then good = runBuildCommand(i, package, path, 'sudo
make PREFIX=' .. installPath .. ' install') end
elseif fileExists(path .. '/CMakeLists.txt') then
if good then good = runBuildCommand(i, package, path, 'mkdir -p
build && cd build && cmake ..') end
if good then good = runBuildCommand(i, package, path, 'cd build
&& make PREFIX=' .. installPath .. ' -j' .. threads) end
@@ -154,6 +151,9 @@ local function build(i, package)
if good then good = runBuildCommand(i, package, path, 'python
setup.py build build_ext --include-dirs=$PYTHONINCLUDE') end
if good then good = runBuildCommand(i, package, path, 'sudo
python setup.py install --prefix=' .. installPath .. ' install_headers
--install-dir=$PYTHONINCLUDE') end
good = false
+ elseif fileExists(path .. '/Makefile') then -- Keep this
last, as others might generate this, so we want to detect those others first.
+ if good then good = runBuildCommand(i, package, path, 'make
PREFIX=' .. installPath .. ' -j' .. threads) end
+ if good then good = runBuildCommand(i, package, path, 'sudo
make PREFIX=' .. installPath .. ' install') end
else
progress(i, package, path, 'NO BUILD SYSTEM!');
good = false
--
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
