diff options
-rw-r--r-- | GNUmakefile | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/GNUmakefile b/GNUmakefile index 31620502..97fada4d 100644 --- a/GNUmakefile +++ b/GNUmakefile | |||
@@ -132,15 +132,12 @@ build-binary/luarocks-admin.exe: luarocks | |||
132 | # Binary install | 132 | # Binary install |
133 | # ---------------------------------------- | 133 | # ---------------------------------------- |
134 | 134 | ||
135 | install-binary: build-binary/luarocks.exe build-binary/luarocks-admin.exe | 135 | LUAROCKS_CORE_FILES = $(wildcard src/luarocks/core/* src/luarocks/loader.lua) |
136 | mkdir -p "$(DESTDIR)$(bindir)" | 136 | INSTALL_BINARY_FILES = $(patsubst src/%, $(DESTDIR)$(luadir)/%, $(LUAROCKS_CORE_FILES)) |
137 | cp build-binary/luarocks.exe "$(DESTDIR)$(bindir)/luarocks" | 137 | |
138 | chmod +rx "$(DESTDIR)$(bindir)/luarocks" | 138 | install-binary: $(INSTALL_BINARY_FILES) build-binary/luarocks.exe build-binary/luarocks-admin.exe |
139 | cp build-binary/luarocks-admin.exe "$(DESTDIR)$(bindir)/luarocks-admin" | 139 | $(INSTALL) -D build-binary/luarocks.exe "$(DESTDIR)$(bindir)/luarocks" |
140 | chmod +rx "$(DESTDIR)$(bindir)/luarocks-admin" | 140 | $(INSTALL) -D build-binary/luarocks-admin.exe "$(DESTDIR)$(bindir)/luarocks-admin" |
141 | mkdir -p "$(DESTDIR)$(luadir)/luarocks/core" | ||
142 | cp -a src/luarocks/core/* "$(DESTDIR)$(luadir)/luarocks/core" | ||
143 | cp -a src/luarocks/loader.lua "$(DESTDIR)$(luadir)/luarocks/" | ||
144 | 141 | ||
145 | # ---------------------------------------- | 142 | # ---------------------------------------- |
146 | # Bootstrap install | 143 | # Bootstrap install |