From bd640437b240796b0aae7ce168041afd206c5d9b Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Fri, 10 Aug 2018 23:23:55 -0300 Subject: GNUmakefile: avoid using -D because it doesn't work on the Mac --- GNUmakefile | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index a8e2a01e..86f965a7 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -115,16 +115,20 @@ INSTALL_FILES = $(DESTDIR)$(bindir)/luarocks \ install: $(INSTALL_FILES) $(DESTDIR)$(bindir)/luarocks: $(builddir)/luarocks - $(INSTALL) -D "$<" "$@" + mkdir -p "$(@D)" + $(INSTALL) "$<" "$@" $(DESTDIR)$(bindir)/luarocks-admin: $(builddir)/luarocks-admin - $(INSTALL) -D "$<" "$@" + mkdir -p "$(@D)" + $(INSTALL) "$<" "$@" $(DESTDIR)$(luadir)/luarocks/%.lua: src/luarocks/%.lua - $(INSTALL_DATA) -D "$<" "$@" + mkdir -p "$(@D)" + $(INSTALL_DATA) "$<" "$@" $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua: $(builddir)/config-$(LUA_VERSION).lua - $(INSTALL_DATA) -D "$<" "$@" + mkdir -p "$(@D)" + $(INSTALL_DATA) "$<" "$@" uninstall: rm -rf $(INSTALL_FILES) @@ -138,8 +142,9 @@ INSTALL_BINARY_FILES = $(patsubst src/%, $(DESTDIR)$(luadir)/%, $(LUAROCKS_CORE_ $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua install-binary: $(INSTALL_BINARY_FILES) - $(INSTALL) -D "$(buildbinarydir)/luarocks.exe" "$(DESTDIR)$(bindir)/luarocks" - $(INSTALL) -D "$(buildbinarydir)/luarocks-admin.exe" "$(DESTDIR)$(bindir)/luarocks-admin" + mkdir -p "$(buildbinarydir)" + $(INSTALL) "$(buildbinarydir)/luarocks.exe" "$(DESTDIR)$(bindir)/luarocks" + $(INSTALL) "$(buildbinarydir)/luarocks-admin.exe" "$(DESTDIR)$(bindir)/luarocks-admin" # ---------------------------------------- # Bootstrap install -- cgit v1.2.3-55-g6feb