archives/freedoom
2
0
Fork 0
mirror of https://github.com/freedoom/freedoom.git synced 2025-09-02 16:25:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved wad2image top level directory determination. (#488)

Browse source
This commit is contained in:
Steven Elliott 2017-09-04 14:44:22 -05:00 • committed by Simon Howard
parent f0fba6eb53
commit 75099abb61
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -127,7 +127,8 @@ target=$(DESTDIR)$(prefix)
WI_LEVELS := levels WI_LEVELS := levels
WI_SCRIPTS := scripts WI_SCRIPTS := scripts
WI_PATH := $(shell command -v wad2image.py) WI_PATH := $(shell command -v wad2image.py)
WI_HOME := $(if $(WI_PATH),$(dir $(WI_PATH))..,$(WI_SCRIPTS)/wad2image) WI_HOME := $(if $(WAD2IMAGE_HOME),$(WAD2IMAGE_HOME),$(if $(WI_PATH),$(shell $(WI_PATH) \
--get-top-dir),$(WI_SCRIPTS)/wad2image))
WI_IMAGES := wad-images WI_IMAGES := wad-images
WI_WAD_SPATH := wads,{top-dir}/wads,.,/usr/share/doom,/usr/local/doom WI_WAD_SPATH := wads,{top-dir}/wads,.,/usr/share/doom,/usr/local/doom
WI_ALL_OPTIONS := $(WI_OPTIONS) $(if $(WI_BW), --colors-images bw,) \ WI_ALL_OPTIONS := $(WI_OPTIONS) $(if $(WI_BW), --colors-images bw,) \