diff --git a/autogen.sh b/autogen.sh index 559e3dd43..fb278559c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -273,7 +273,7 @@ touch ${srcdir}/aegisub/posix/config.h echo "--- Converting BMP resource files -> XPM ---" # BMP -> XPM via src/res.rc -cat ${srcdir}/aegisub/res.rc | ${BIN_AWK} -f ${srcdir}/scripts/genxpm.awk > ${srcdir}/aegisub/bitmaps/Makefile.bitmaps +cat ${srcdir}/aegisub/res.rc | ${BIN_AWK} -f ${srcdir}/scripts/genxpm.awk BIN_CONVERT="$BIN_CONVERT" > ${srcdir}/aegisub/bitmaps/Makefile.bitmaps cd ${srcdir}/aegisub/bitmaps make -f Makefile.bitmaps cd ${srcdir} diff --git a/scripts/genxpm.awk b/scripts/genxpm.awk index 12ff21df2..21356235d 100644 --- a/scripts/genxpm.awk +++ b/scripts/genxpm.awk @@ -8,8 +8,8 @@ END { printf(" \ all: bmp2xpm wxicon_xpm.xpm \n \ .PHONY: all bmp2xpm \n \ -CONVERT ?= convert \n \ -") +CONVERT ?= %s \n \ +", BIN_CONVERT) printf("wxicon_xpm.xpm: icon.ico\n $(CONVERT) 'icon.ico[2]' wxicon_xpm.xpm\n");