diff options
author | Peter Melnichenko <mpeterval@gmail.com> | 2016-06-13 12:10:59 +0300 |
---|---|---|
committer | Peter Melnichenko <mpeterval@gmail.com> | 2016-06-13 12:29:06 +0300 |
commit | 9fa380490931813a153b1cb079c2b3c21092bacf (patch) | |
tree | cb0cafa825a7815810d13945d20808cc43869c03 /Makefile | |
parent | 0bed8bc1cf789ec3539469ed7d6ec437446b1b95 (diff) | |
parent | f75295ee52bc2c335d12e82282d0f92a419a82d1 (diff) | |
download | luarocks-9fa380490931813a153b1cb079c2b3c21092bacf.tar.gz luarocks-9fa380490931813a153b1cb079c2b3c21092bacf.tar.bz2 luarocks-9fa380490931813a153b1cb079c2b3c21092bacf.zip |
Merge branch 'master' into luarocks-3
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -92,7 +92,7 @@ build_bins: cleanup_bins | |||
92 | echo "#!$(LUA_BINDIR)/lua$(LUA_SUFFIX)" > src/bin/$$f ;\ | 92 | echo "#!$(LUA_BINDIR)/lua$(LUA_SUFFIX)" > src/bin/$$f ;\ |
93 | echo "package.path = [[$(LUADIR)/?.lua;]]..package.path" | sed "s,//,/,g" >> src/bin/$$f ;\ | 93 | echo "package.path = [[$(LUADIR)/?.lua;]]..package.path" | sed "s,//,/,g" >> src/bin/$$f ;\ |
94 | cat src/bin/$$f.bak >> src/bin/$$f ;\ | 94 | cat src/bin/$$f.bak >> src/bin/$$f ;\ |
95 | chmod +x src/bin/$$f ;\ | 95 | chmod +rx src/bin/$$f ;\ |
96 | rm -f src/bin/$$f.bak ;\ | 96 | rm -f src/bin/$$f.bak ;\ |
97 | done | 97 | done |
98 | 98 | ||
@@ -117,7 +117,7 @@ cleanup_bins: | |||
117 | do \ | 117 | do \ |
118 | mv src/bin/$$f src/bin/$$f.bak ;\ | 118 | mv src/bin/$$f src/bin/$$f.bak ;\ |
119 | sed "s,^#!.*lua.*,#!/usr/bin/env lua,;/^package.path/d" < src/bin/$$f.bak > src/bin/$$f ;\ | 119 | sed "s,^#!.*lua.*,#!/usr/bin/env lua,;/^package.path/d" < src/bin/$$f.bak > src/bin/$$f ;\ |
120 | chmod +x src/bin/$$f ;\ | 120 | chmod +rx src/bin/$$f ;\ |
121 | rm -f src/bin/$$f.bak ;\ | 121 | rm -f src/bin/$$f.bak ;\ |
122 | done | 122 | done |
123 | 123 | ||