aboutsummaryrefslogtreecommitdiff
path: root/binary
diff options
context:
space:
mode:
authorPeter Melnichenko <mpeterval@gmail.com>2018-07-10 18:44:54 +0300
committerHisham Muhammad <hisham@gobolinux.org>2018-07-10 20:27:08 -0300
commit74352926fd13834b5b369a70aff3481357483833 (patch)
treee69f369614a740ba9bfd8c5e4576e55eb8ed8692 /binary
parent9d38b91692d53cc485c55bad8d55357f04b30141 (diff)
downloadluarocks-74352926fd13834b5b369a70aff3481357483833.tar.gz
luarocks-74352926fd13834b5b369a70aff3481357483833.tar.bz2
luarocks-74352926fd13834b5b369a70aff3481357483833.zip
Use $(CURDIR) instead of $(PWD) in Makefiles
$(CURDIR) is built-in and is guaranteed to always work. $(PWD) is inherited from the shell and may be incorrect or missing. In particular, it is invalid if make is run by some program that changes current directory prior to the execution.
Diffstat (limited to 'binary')
-rw-r--r--binary/Makefile.windows6
1 files changed, 3 insertions, 3 deletions
diff --git a/binary/Makefile.windows b/binary/Makefile.windows
index e21ae8df..acdf34a4 100644
--- a/binary/Makefile.windows
+++ b/binary/Makefile.windows
@@ -15,7 +15,7 @@ windows-binary: windows-deps/lib/liblua.a windows-deps/lib/libssl.a windows-deps
15 STATIC_GCC_RANLIB=$(MINGW_PREFIX)-ranlib \ 15 STATIC_GCC_RANLIB=$(MINGW_PREFIX)-ranlib \
16 STATIC_GCC_CC=$(MINGW_PREFIX)-gcc \ 16 STATIC_GCC_CC=$(MINGW_PREFIX)-gcc \
17 LUAROCKS_CROSS_COMPILING=1 \ 17 LUAROCKS_CROSS_COMPILING=1 \
18 make binary LUA_DIR=$(PWD)/windows-deps BINARY_CC=$(MINGW_PREFIX)-gcc BINARY_NM=$(MINGW_PREFIX)-nm BINARY_PLATFORM=windows BINARY_TARGET=build-windows-binary BINARY_SYSROOT=$(MINGW_SYSROOT) 18 make binary LUA_DIR=$(CURDIR)/windows-deps BINARY_CC=$(MINGW_PREFIX)-gcc BINARY_NM=$(MINGW_PREFIX)-nm BINARY_PLATFORM=windows BINARY_TARGET=build-windows-binary BINARY_SYSROOT=$(MINGW_SYSROOT)
19 19
20build-windows-deps/lua-$(LIBLUA_VERSION).tar.gz: 20build-windows-deps/lua-$(LIBLUA_VERSION).tar.gz:
21 mkdir -p build-windows-deps 21 mkdir -p build-windows-deps
@@ -35,7 +35,7 @@ build-windows-deps/openssl-$(OPENSSL_VERSION).tar.gz:
35build-windows-deps/openssl-$(OPENSSL_VERSION): build-windows-deps/openssl-$(OPENSSL_VERSION).tar.gz 35build-windows-deps/openssl-$(OPENSSL_VERSION): build-windows-deps/openssl-$(OPENSSL_VERSION).tar.gz
36 cd build-windows-deps && tar zxvpf openssl-$(OPENSSL_VERSION).tar.gz 36 cd build-windows-deps && tar zxvpf openssl-$(OPENSSL_VERSION).tar.gz
37windows-deps/lib/libssl.a: build-windows-deps/openssl-$(OPENSSL_VERSION) 37windows-deps/lib/libssl.a: build-windows-deps/openssl-$(OPENSSL_VERSION)
38 cd build-windows-deps/openssl-$(OPENSSL_VERSION) && ./Configure --prefix=$(PWD)/windows-deps --cross-compile-prefix=$(MINGW_PREFIX)- $(OPENSSL_PLATFORM) 38 cd build-windows-deps/openssl-$(OPENSSL_VERSION) && ./Configure --prefix=$(CURDIR)/windows-deps --cross-compile-prefix=$(MINGW_PREFIX)- $(OPENSSL_PLATFORM)
39 cd build-windows-deps/openssl-$(OPENSSL_VERSION) && make 39 cd build-windows-deps/openssl-$(OPENSSL_VERSION) && make
40 cd build-windows-deps/openssl-$(OPENSSL_VERSION) && make install_sw 40 cd build-windows-deps/openssl-$(OPENSSL_VERSION) && make install_sw
41 41
@@ -46,7 +46,7 @@ build-windows-deps/zlib-$(ZLIB_VERSION): build-windows-deps/zlib-$(ZLIB_VERSION)
46 cd build-windows-deps && tar zxvpf zlib-$(ZLIB_VERSION).tar.gz 46 cd build-windows-deps && tar zxvpf zlib-$(ZLIB_VERSION).tar.gz
47windows-deps/lib/libz.a: build-windows-deps/zlib-$(ZLIB_VERSION) 47windows-deps/lib/libz.a: build-windows-deps/zlib-$(ZLIB_VERSION)
48 cd build-windows-deps/zlib-$(ZLIB_VERSION) && sed -ie "s,dllwrap,$(MINGW_PREFIX)-dllwrap," win32/Makefile.gcc 48 cd build-windows-deps/zlib-$(ZLIB_VERSION) && sed -ie "s,dllwrap,$(MINGW_PREFIX)-dllwrap," win32/Makefile.gcc
49 cd build-windows-deps/zlib-$(ZLIB_VERSION) && ./configure --prefix=$(PWD)/windows-deps --static 49 cd build-windows-deps/zlib-$(ZLIB_VERSION) && ./configure --prefix=$(CURDIR)/windows-deps --static
50 cd build-windows-deps/zlib-$(ZLIB_VERSION) && make -f win32/Makefile.gcc CC=$(MINGW_PREFIX)-gcc AR=$(MINGW_PREFIX)-ar RC=$(MINGW_PREFIX)-windres STRIP=$(MINGW_PREFIX)-strip IMPLIB=libz.dll.a 50 cd build-windows-deps/zlib-$(ZLIB_VERSION) && make -f win32/Makefile.gcc CC=$(MINGW_PREFIX)-gcc AR=$(MINGW_PREFIX)-ar RC=$(MINGW_PREFIX)-windres STRIP=$(MINGW_PREFIX)-strip IMPLIB=libz.dll.a
51 mkdir -p windows-deps/include 51 mkdir -p windows-deps/include
52 cd build-windows-deps/zlib-$(ZLIB_VERSION) && cp zlib.h zconf.h ../../windows-deps/include 52 cd build-windows-deps/zlib-$(ZLIB_VERSION) && cp zlib.h zconf.h ../../windows-deps/include