From c624761d32c10579938edb01bf3f75d919e7527a Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 15 May 2012 18:27:46 +0200 Subject: [PATCH 1/2] src/makefile: Move mkdir to a variable --- src/makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/makefile b/src/makefile index 70425c4..f7a9d0d 100644 --- a/src/makefile +++ b/src/makefile @@ -75,6 +75,7 @@ print: # Install directories # +INSTALL_DIR=mkdir -p INSTALL_DATA=cp INSTALL_EXEC=cp INSTALL_TOP=$(DESTDIR)$(prefix) @@ -271,13 +272,13 @@ $(SERIAL_SO): $(SERIAL_OBJS) $(LD) $(SERIAL_OBJS) $(LDFLAGS)$@ install: - mkdir -p $(INSTALL_TOP_SHARE) + $(INSTALL_DIR) $(INSTALL_TOP_SHARE) $(INSTALL_DATA) $(TO_TOP_SHARE) $(INSTALL_TOP_SHARE) - mkdir -p $(INSTALL_SOCKET_SHARE) + $(INSTALL_DIR) $(INSTALL_SOCKET_SHARE) $(INSTALL_DATA) $(TO_SOCKET_SHARE) $(INSTALL_SOCKET_SHARE) - mkdir -p $(INSTALL_SOCKET_LIB) + $(INSTALL_DIR) $(INSTALL_SOCKET_LIB) $(INSTALL_EXEC) $(SOCKET_SO) $(INSTALL_SOCKET_LIB)/core.$(SO) - mkdir -p $(INSTALL_MIME_LIB) + $(INSTALL_DIR) $(INSTALL_MIME_LIB) $(INSTALL_EXEC) $(MIME_SO) $(INSTALL_MIME_LIB)/core.$(SO) install-unix: install From 36461db5bb38cac423af03f49ba084817d4d76d1 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 15 May 2012 18:44:38 +0200 Subject: [PATCH 2/2] src/makefile: Use install instead of cp and mkdir. --- src/makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/makefile b/src/makefile index f7a9d0d..9213714 100644 --- a/src/makefile +++ b/src/makefile @@ -75,9 +75,9 @@ print: # Install directories # -INSTALL_DIR=mkdir -p -INSTALL_DATA=cp -INSTALL_EXEC=cp +INSTALL_DIR=install -d +INSTALL_DATA=install -m644 +INSTALL_EXEC=install INSTALL_TOP=$(DESTDIR)$(prefix) INSTALL_TOP_SHARE=$(INSTALL_TOP)/share/lua/$(LUAV)