diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2018-08-10 23:23:55 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-08-10 23:25:09 -0300 |
| commit | bd640437b240796b0aae7ce168041afd206c5d9b (patch) | |
| tree | 49c112f83f766cd90bf39c0f10a170d8772a5dfe | |
| parent | f893acf2409bb4ec8a4669a9e4380a98737c6b40 (diff) | |
| download | luarocks-bd640437b240796b0aae7ce168041afd206c5d9b.tar.gz luarocks-bd640437b240796b0aae7ce168041afd206c5d9b.tar.bz2 luarocks-bd640437b240796b0aae7ce168041afd206c5d9b.zip | |
GNUmakefile: avoid using -D because it doesn't work on the Mac
| -rw-r--r-- | GNUmakefile | 17 |
1 files 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 \ | |||
| 115 | install: $(INSTALL_FILES) | 115 | install: $(INSTALL_FILES) |
| 116 | 116 | ||
| 117 | $(DESTDIR)$(bindir)/luarocks: $(builddir)/luarocks | 117 | $(DESTDIR)$(bindir)/luarocks: $(builddir)/luarocks |
| 118 | $(INSTALL) -D "$<" "$@" | 118 | mkdir -p "$(@D)" |
| 119 | $(INSTALL) "$<" "$@" | ||
| 119 | 120 | ||
| 120 | $(DESTDIR)$(bindir)/luarocks-admin: $(builddir)/luarocks-admin | 121 | $(DESTDIR)$(bindir)/luarocks-admin: $(builddir)/luarocks-admin |
| 121 | $(INSTALL) -D "$<" "$@" | 122 | mkdir -p "$(@D)" |
| 123 | $(INSTALL) "$<" "$@" | ||
| 122 | 124 | ||
| 123 | $(DESTDIR)$(luadir)/luarocks/%.lua: src/luarocks/%.lua | 125 | $(DESTDIR)$(luadir)/luarocks/%.lua: src/luarocks/%.lua |
| 124 | $(INSTALL_DATA) -D "$<" "$@" | 126 | mkdir -p "$(@D)" |
| 127 | $(INSTALL_DATA) "$<" "$@" | ||
| 125 | 128 | ||
| 126 | $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua: $(builddir)/config-$(LUA_VERSION).lua | 129 | $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua: $(builddir)/config-$(LUA_VERSION).lua |
| 127 | $(INSTALL_DATA) -D "$<" "$@" | 130 | mkdir -p "$(@D)" |
| 131 | $(INSTALL_DATA) "$<" "$@" | ||
| 128 | 132 | ||
| 129 | uninstall: | 133 | uninstall: |
| 130 | rm -rf $(INSTALL_FILES) | 134 | rm -rf $(INSTALL_FILES) |
| @@ -138,8 +142,9 @@ INSTALL_BINARY_FILES = $(patsubst src/%, $(DESTDIR)$(luadir)/%, $(LUAROCKS_CORE_ | |||
| 138 | $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua | 142 | $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua |
| 139 | 143 | ||
| 140 | install-binary: $(INSTALL_BINARY_FILES) | 144 | install-binary: $(INSTALL_BINARY_FILES) |
| 141 | $(INSTALL) -D "$(buildbinarydir)/luarocks.exe" "$(DESTDIR)$(bindir)/luarocks" | 145 | mkdir -p "$(buildbinarydir)" |
| 142 | $(INSTALL) -D "$(buildbinarydir)/luarocks-admin.exe" "$(DESTDIR)$(bindir)/luarocks-admin" | 146 | $(INSTALL) "$(buildbinarydir)/luarocks.exe" "$(DESTDIR)$(bindir)/luarocks" |
| 147 | $(INSTALL) "$(buildbinarydir)/luarocks-admin.exe" "$(DESTDIR)$(bindir)/luarocks-admin" | ||
| 143 | 148 | ||
| 144 | # ---------------------------------------- | 149 | # ---------------------------------------- |
| 145 | # Bootstrap install | 150 | # Bootstrap install |