mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-10 14:41:43 +00:00
aedi: better install customization
`install` command line argument is implicit only when no options are specified, and it needs to be added explicitly otherwise
This commit is contained in:
parent
80c4a917a3
commit
b89ee4e73c
3 changed files with 9 additions and 4 deletions
|
@ -133,8 +133,8 @@ class BuildTarget(Target):
|
|||
if state.install_path.exists():
|
||||
shutil.rmtree(state.install_path)
|
||||
|
||||
args = [tool, 'install']
|
||||
args += options and options.to_list() or []
|
||||
args = [tool]
|
||||
args += options and options.to_list() or ['install']
|
||||
|
||||
subprocess.run(args, check=True, cwd=state.build_path, env=state.environment)
|
||||
|
||||
|
|
|
@ -43,7 +43,9 @@ class Bzip2Target(MakeTarget):
|
|||
opts[cflags] = state.environment[cflags] + ' -D_FILE_OFFSET_BITS=64 -O2'
|
||||
|
||||
def post_build(self, state: BuildState):
|
||||
state.options['PREFIX'] = state.install_path
|
||||
opts = state.options
|
||||
opts['install'] = None
|
||||
opts['PREFIX'] = state.install_path
|
||||
|
||||
self.install(state, state.options)
|
||||
self.write_pc_file(state, description='bzip2 compression library', version='1.0.8', libs='-lbz2')
|
||||
|
|
|
@ -241,7 +241,10 @@ class LuaTarget(MakeTarget):
|
|||
return state.has_source_file('src/lua.h')
|
||||
|
||||
def post_build(self, state: BuildState):
|
||||
state.options['INSTALL_TOP'] = state.install_path
|
||||
opts = state.options
|
||||
opts['install'] = None
|
||||
opts['INSTALL_TOP'] = state.install_path
|
||||
|
||||
self.install(state, state.options)
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue