diff options
author | Reuben Thomas <rrt@sc3d.org> | 2012-05-23 12:21:53 +0100 |
---|---|---|
committer | Reuben Thomas <rrt@sc3d.org> | 2012-05-23 12:21:53 +0100 |
commit | 33f5f334a2fa76caad513307278b2dcc11cece2d (patch) | |
tree | 36adfbe816990f06248fc41d534ddbefab0b5483 | |
parent | dda6b0c82667f0e0a2bac9cf5c611314e0eba15a (diff) | |
download | luarocks-33f5f334a2fa76caad513307278b2dcc11cece2d.tar.gz luarocks-33f5f334a2fa76caad513307278b2dcc11cece2d.tar.bz2 luarocks-33f5f334a2fa76caad513307278b2dcc11cece2d.zip |
Makefile: fix install targets for parallel Make.
-rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -115,19 +115,19 @@ clean: cleanup_bins | |||
115 | rm -f src/luarocks/site_config.lua | 115 | rm -f src/luarocks/site_config.lua |
116 | rm -f built | 116 | rm -f built |
117 | 117 | ||
118 | install_bins: | 118 | install_bins: built |
119 | mkdir -p "$(DESTDIR)$(BINDIR)" | 119 | mkdir -p "$(DESTDIR)$(BINDIR)" |
120 | cd src/bin && cp $(BIN_FILES) "$(DESTDIR)$(BINDIR)" | 120 | cd src/bin && cp $(BIN_FILES) "$(DESTDIR)$(BINDIR)" |
121 | 121 | ||
122 | install_luas: | 122 | install_luas: built |
123 | mkdir -p "$(DESTDIR)$(LUADIR)/luarocks" | 123 | mkdir -p "$(DESTDIR)$(LUADIR)/luarocks" |
124 | cd src/luarocks && for f in $(LUAROCKS_FILES); do d="$(DESTDIR)$(LUADIR)/luarocks"/`dirname "$$f"`; mkdir -p "$$d"; cp "$$f" "$$d"; done | 124 | cd src/luarocks && for f in $(LUAROCKS_FILES); do d="$(DESTDIR)$(LUADIR)/luarocks"/`dirname "$$f"`; mkdir -p "$$d"; cp "$$f" "$$d"; done |
125 | 125 | ||
126 | install_site_config: | 126 | install_site_config: built |
127 | mkdir -p "$(DESTDIR)$(LUADIR)/luarocks" | 127 | mkdir -p "$(DESTDIR)$(LUADIR)/luarocks" |
128 | cd src/luarocks && cp site_config.lua "$(DESTDIR)$(LUADIR)/luarocks" | 128 | cd src/luarocks && cp site_config.lua "$(DESTDIR)$(LUADIR)/luarocks" |
129 | 129 | ||
130 | write_sysconfig: | 130 | write_sysconfig: built |
131 | mkdir -p "$(DESTDIR)$(ROCKS_TREE)" | 131 | mkdir -p "$(DESTDIR)$(ROCKS_TREE)" |
132 | if [ ! -f "$(DESTDIR)$(CONFIG_FILE)" ] ;\ | 132 | if [ ! -f "$(DESTDIR)$(CONFIG_FILE)" ] ;\ |
133 | then \ | 133 | then \ |
@@ -144,7 +144,7 @@ write_sysconfig: | |||
144 | echo '}' >> "$(DESTDIR)$(CONFIG_FILE)" ;\ | 144 | echo '}' >> "$(DESTDIR)$(CONFIG_FILE)" ;\ |
145 | fi | 145 | fi |
146 | 146 | ||
147 | install: built install_bins install_luas install_site_config write_sysconfig | 147 | install: install_bins install_luas install_site_config write_sysconfig |
148 | 148 | ||
149 | bootstrap: src/luarocks/site_config.lua install_site_config write_sysconfig | 149 | bootstrap: src/luarocks/site_config.lua install_site_config write_sysconfig |
150 | LUA_PATH="$$PWD/src/?.lua;$$LUA_PATH" src/bin/luarocks make rockspec | 150 | LUA_PATH="$$PWD/src/?.lua;$$LUA_PATH" src/bin/luarocks make rockspec |