From f8d4ac493de6165e04ab12c3adba098ee1347842 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Sun, 5 Aug 2018 12:21:38 +1000
Subject: Makefile: Create ./build/luarocks{,-admin} in build phase

---
 Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 3e141ae5..1fa7a68b 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ all: build
 # Base build
 # ----------------------------------------
 
-build: luarocks luarocks-admin
+build: luarocks luarocks-admin ./build/luarocks ./build/luarocks-admin
 
 config.unix:
 	@echo Please run the "./configure" script before building.
@@ -35,14 +35,6 @@ luarocks-admin: config.unix
 	echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA_BINDIR)/$(LUA_INTERPRETER)" "$(CURDIR)/src/bin/luarocks-admin" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks-admin
 	chmod +rx ./luarocks-admin
 
-# ----------------------------------------
-# Regular install
-# ----------------------------------------
-
-install: all $(DESTDIR)$(prefix)/bin/luarocks $(DESTDIR)$(prefix)/bin/luarocks-admin $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua
-	mkdir -p "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks"
-	cp -a src/luarocks/* "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks"
-
 ./build/luarocks: src/bin/luarocks config.unix
 	mkdir -p "$(@D)"
 	(printf '#!$(LUA_BINDIR)/$(LUA_INTERPRETER)\n'\
@@ -59,6 +51,14 @@ install: all $(DESTDIR)$(prefix)/bin/luarocks $(DESTDIR)$(prefix)/bin/luarocks-a
 	tail -n +2 src/bin/luarocks-admin \
 	)> "$@"
 
+# ----------------------------------------
+# Regular install
+# ----------------------------------------
+
+install: all $(DESTDIR)$(prefix)/bin/luarocks $(DESTDIR)$(prefix)/bin/luarocks-admin $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua
+	mkdir -p "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks"
+	cp -a src/luarocks/* "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks"
+
 $(DESTDIR)$(prefix)/bin/luarocks: ./build/luarocks
 	$(INSTALL) -D "$<" "$@"
 
-- 
cgit v1.2.3-55-g6feb