forked from enlightenment/enlightenment
make some find_program() calls non-required in meson build
reported by wltjr
This commit is contained in:
parent
4d96d55c15
commit
4845823d74
|
@ -28,7 +28,7 @@ else
|
||||||
SUSPEND = '/etc/acpi/sleep.sh force'
|
SUSPEND = '/etc/acpi/sleep.sh force'
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
suspend = find_program('pm-suspend', '/etc/acpi/pm-suspend', '/sbin/pm-suspend', '/usr/sbin/pm-suspend')
|
suspend = find_program('pm-suspend', '/etc/acpi/pm-suspend', '/sbin/pm-suspend', '/usr/sbin/pm-suspend', required: false)
|
||||||
if suspend.found()
|
if suspend.found()
|
||||||
SUSPEND = suspend.path()
|
SUSPEND = suspend.path()
|
||||||
endif
|
endif
|
||||||
|
@ -41,7 +41,7 @@ else
|
||||||
SUSPEND = '/etc/acpi/hibernate.sh force'
|
SUSPEND = '/etc/acpi/hibernate.sh force'
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
hibernate = find_program('pm-hibernate', '/etc/acpi/pm-hibernate', '/sbin/pm-hibernate', '/usr/sbin/pm-hibernate')
|
hibernate = find_program('pm-hibernate', '/etc/acpi/pm-hibernate', '/sbin/pm-hibernate', '/usr/sbin/pm-hibernate', required: false)
|
||||||
if hibernate.found()
|
if hibernate.found()
|
||||||
HIBERNATE = hibernate.path()
|
HIBERNATE = hibernate.path()
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -18,7 +18,7 @@ endif
|
||||||
|
|
||||||
e_version = ver.split('.')
|
e_version = ver.split('.')
|
||||||
git_version = '0'
|
git_version = '0'
|
||||||
git = find_program('git')
|
git = find_program('git', required: false)
|
||||||
if git.found() == true
|
if git.found() == true
|
||||||
git_cmd = run_command(git.path(), 'rev-list', '--count', 'HEAD')
|
git_cmd = run_command(git.path(), 'rev-list', '--count', 'HEAD')
|
||||||
if git_cmd.returncode() == 0
|
if git_cmd.returncode() == 0
|
||||||
|
|
Loading…
Reference in New Issue