diff --git a/Makefile b/Makefile index ba70deb..2a1a075 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ -include Makelocal.mk PATH_SDCC ?= /usr/bin -PATH_HEX2BIN ?= /usr/bin PATH_BIN := bin BUILD_ALL := "Use 'make help' for possible targets." BUILD_HELP := "Use one of the following build targets;" @@ -33,7 +32,7 @@ bin/omsxctl/omsxctl.hex: bin/omsxctl/omsxctl.rel BUILD_HELP += \\n\\t* bin/omsxctl/omsxctl.com bin/omsxctl/omsxctl.com: bin/omsxctl/omsxctl.hex - cd bin/omsxctl && $(PATH_HEX2BIN)/hex2bin -e com omsxctl.hex + $(PATH_SDCC)/sdobjcopy -I ihex --output-target=binary $< $@ bin/dist: mkdir -p bin/dist diff --git a/Makelocal.mk.tpl b/Makelocal.mk.tpl index 1342dfe..3a6dd1a 100644 --- a/Makelocal.mk.tpl +++ b/Makelocal.mk.tpl @@ -4,4 +4,4 @@ # Change to local installations if needed; #PATH_SDCC ?= /usr/bin -#PATH_HEX2BIN ?= /usr/bin +