diff --git a/doc/release.txt b/doc/release.txt index 0367cc4f535e1b74c608c31466e6ae9c871afb10..b68d83c4555e4e02d233eae36e0ed17b5b1c47be 100644 --- a/doc/release.txt +++ b/doc/release.txt @@ -23,7 +23,7 @@ to https://archive.mozilla.org/pub/opus/ Win32 binaries: - Assuming the mingw cross toolchain: -- run cd mingw && make +- run `make -C mingw` - Downloads versions of libogg, opus, openssl. - Compiles them. - Compiles static opusfile and examples against the built deps. diff --git a/mingw/Makefile b/mingw/Makefile index 140feef7a16e648d97798bc435f9f1fa04174914..56202cb5f786939f819a7cf0460f1c2c9dd24cbb 100644 --- a/mingw/Makefile +++ b/mingw/Makefile @@ -17,12 +17,12 @@ ssl_SHA := b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 libopusfile-0.dll: ../unix/Makefile $(DEPS) CC=$(TOOL_PREFIX)-gcc \ RANLIB=$(TOOL_PREFIX)-ranlib \ - PKG_CONFIG_PATH=${PWD}/lib/pkgconfig \ + PKG_CONFIG_PATH=$(CURDIR)/lib/pkgconfig \ $(MAKE) -f $< opusfile: $(DEPS) - ../configure --host=$(TOOL_PREFIX) --prefix=${PWD} \ - PKG_CONFIG_PATH=${PWD}/lib/pkgconfig + ../configure --host=$(TOOL_PREFIX) --prefix=$(CURDIR) \ + PKG_CONFIG_PATH=$(CURDIR)/lib/pkgconfig $(MAKE) clean: @@ -57,18 +57,18 @@ $(foreach dep,$(DEPS),$(eval $(call WGET_template,$(dep)))) # NOTE: 'make check' generally requires wine with cross-compiling. ogg_BUILD: $(ogg_DIR) - cd $< && ./configure --host=$(TOOL_PREFIX) --prefix=${PWD} + cd $< && ./configure --host=$(TOOL_PREFIX) --prefix=$(CURDIR) $(MAKE) -C $< check $(MAKE) -C $< install opus_BUILD: $(opus_DIR) - cd $< && ./configure --host=$(TOOL_PREFIX) --prefix=${PWD} + cd $< && ./configure --host=$(TOOL_PREFIX) --prefix=$(CURDIR) $(MAKE) -C $< check $(MAKE) -C $< install ssl_BUILD: $(ssl_DIR) cd $< && ./Configure shared mingw64 no-asm \ - --prefix=${PWD} \ + --prefix=$(CURDIR) \ --cross-compile-prefix=$(TOOL_PREFIX)- $(MAKE) -C $< depend $(MAKE) -C $<