aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorThijs Schreijer <thijs@thijsschreijer.nl>2013-11-12 16:49:18 +0100
committerThijs Schreijer <thijs@thijsschreijer.nl>2013-11-12 16:49:18 +0100
commit7e520a520283ee27c384660aa31259e609cb5e6e (patch)
treeefbb1433d78ae0957ddeb5f6299dea34ebc3e551 /Makefile
parenta726e45ec81e2cc8512f9e4c5b1459a86ab53098 (diff)
parentbdcde8743014964b3fbe13154bedc9ac6bceae76 (diff)
downloadluarocks-7e520a520283ee27c384660aa31259e609cb5e6e.tar.gz
luarocks-7e520a520283ee27c384660aa31259e609cb5e6e.tar.bz2
luarocks-7e520a520283ee27c384660aa31259e609cb5e6e.zip
Merge branch 'master' of github.com:Tieske/luarocks into win_install_checkpath
Conflicts: install.bat
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b2701aa3..8933d8aa 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,7 @@ install_bins: built
143 cd src/bin && for f in $(BIN_FILES); \ 143 cd src/bin && for f in $(BIN_FILES); \
144 do \ 144 do \
145 cp "$$f" "$(DESTDIR)$(BINDIR)/$$f-$(LUA_VERSION)"; \ 145 cp "$$f" "$(DESTDIR)$(BINDIR)/$$f-$(LUA_VERSION)"; \
146 ln -nfs "$(DESTDIR)$(BINDIR)/$$f-$(LUA_VERSION)" "$(DESTDIR)$(BINDIR)/$$f"; \ 146 ln -nfs "$$f-$(LUA_VERSION)" "$(DESTDIR)$(BINDIR)/$$f"; \
147 done 147 done
148 148
149install_luas: built 149install_luas: built