aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Nehab <diego.nehab@gmail.com>2012-07-31 22:00:03 -0700
committerDiego Nehab <diego.nehab@gmail.com>2012-07-31 22:00:03 -0700
commitc1bb432effa502d055c23857a12e93a4bbc780d1 (patch)
tree78fc7b069399bda5853fb3919aac5ef3a6fc8d21
parent05535a19f81d181b7e15d241892e794a00905bb9 (diff)
parent36461db5bb38cac423af03f49ba084817d4d76d1 (diff)
downloadluasocket-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
-rw-r--r--src/makefile13
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
78INSTALL_DATA=cp 78INSTALL_DIR=install -d
79INSTALL_EXEC=cp 79INSTALL_DATA=install -m644
80INSTALL_EXEC=install
80INSTALL_TOP=$(DESTDIR)$(prefix) 81INSTALL_TOP=$(DESTDIR)$(prefix)
81 82
82INSTALL_TOP_SHARE=$(INSTALL_TOP)/share/lua/$(LUAV) 83INSTALL_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
273install: 274install:
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
283install-unix: install 284install-unix: install