diff options
| author | Diego Nehab <diego.nehab@gmail.com> | 2012-07-31 22:00:03 -0700 |
|---|---|---|
| committer | Diego Nehab <diego.nehab@gmail.com> | 2012-07-31 22:00:03 -0700 |
| commit | c1bb432effa502d055c23857a12e93a4bbc780d1 (patch) | |
| tree | 78fc7b069399bda5853fb3919aac5ef3a6fc8d21 /src | |
| parent | 05535a19f81d181b7e15d241892e794a00905bb9 (diff) | |
| parent | 36461db5bb38cac423af03f49ba084817d4d76d1 (diff) | |
| download | luasocket-c1bb432effa502d055c23857a12e93a4bbc780d1.tar.gz luasocket-c1bb432effa502d055c23857a12e93a4bbc780d1.tar.bz2 luasocket-c1bb432effa502d055c23857a12e93a4bbc780d1.zip | |
Merge pull request #14 from Zash/zash-improves-makefile
Use the install util instead of cp and mkdir
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/makefile b/src/makefile index 70425c4..9213714 100644 --- a/src/makefile +++ b/src/makefile | |||
| @@ -75,8 +75,9 @@ print: | |||
| 75 | # Install directories | 75 | # Install directories |
| 76 | # | 76 | # |
| 77 | 77 | ||
| 78 | INSTALL_DATA=cp | 78 | INSTALL_DIR=install -d |
| 79 | INSTALL_EXEC=cp | 79 | INSTALL_DATA=install -m644 |
| 80 | INSTALL_EXEC=install | ||
| 80 | INSTALL_TOP=$(DESTDIR)$(prefix) | 81 | INSTALL_TOP=$(DESTDIR)$(prefix) |
| 81 | 82 | ||
| 82 | INSTALL_TOP_SHARE=$(INSTALL_TOP)/share/lua/$(LUAV) | 83 | INSTALL_TOP_SHARE=$(INSTALL_TOP)/share/lua/$(LUAV) |
| @@ -271,13 +272,13 @@ $(SERIAL_SO): $(SERIAL_OBJS) | |||
| 271 | $(LD) $(SERIAL_OBJS) $(LDFLAGS)$@ | 272 | $(LD) $(SERIAL_OBJS) $(LDFLAGS)$@ |
| 272 | 273 | ||
| 273 | install: | 274 | install: |
| 274 | mkdir -p $(INSTALL_TOP_SHARE) | 275 | $(INSTALL_DIR) $(INSTALL_TOP_SHARE) |
| 275 | $(INSTALL_DATA) $(TO_TOP_SHARE) $(INSTALL_TOP_SHARE) | 276 | $(INSTALL_DATA) $(TO_TOP_SHARE) $(INSTALL_TOP_SHARE) |
| 276 | mkdir -p $(INSTALL_SOCKET_SHARE) | 277 | $(INSTALL_DIR) $(INSTALL_SOCKET_SHARE) |
| 277 | $(INSTALL_DATA) $(TO_SOCKET_SHARE) $(INSTALL_SOCKET_SHARE) | 278 | $(INSTALL_DATA) $(TO_SOCKET_SHARE) $(INSTALL_SOCKET_SHARE) |
| 278 | mkdir -p $(INSTALL_SOCKET_LIB) | 279 | $(INSTALL_DIR) $(INSTALL_SOCKET_LIB) |
| 279 | $(INSTALL_EXEC) $(SOCKET_SO) $(INSTALL_SOCKET_LIB)/core.$(SO) | 280 | $(INSTALL_EXEC) $(SOCKET_SO) $(INSTALL_SOCKET_LIB)/core.$(SO) |
| 280 | mkdir -p $(INSTALL_MIME_LIB) | 281 | $(INSTALL_DIR) $(INSTALL_MIME_LIB) |
| 281 | $(INSTALL_EXEC) $(MIME_SO) $(INSTALL_MIME_LIB)/core.$(SO) | 282 | $(INSTALL_EXEC) $(MIME_SO) $(INSTALL_MIME_LIB)/core.$(SO) |
| 282 | 283 | ||
| 283 | install-unix: install | 284 | install-unix: install |
