From 51c760eef7118c8e14bbff2a03f916effe57d0ee Mon Sep 17 00:00:00 2001 From: Lekensteyn Date: Sun, 22 Apr 2012 15:37:00 +0200 Subject: [PATCH] Use coreutils' install command, support DESTDIR --- Buffer/Makefile | 3 ++- Connector_HTTP/Makefile | 3 ++- Connector_RAW/Makefile | 3 ++- Connector_RTMP/Makefile | 3 ++- DDV_Controller/Makefile | 3 +++ 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Buffer/Makefile b/Buffer/Makefile index 4557dc18..4e3c80f3 100644 --- a/Buffer/Makefile +++ b/Buffer/Makefile @@ -5,6 +5,7 @@ INCLUDES = DEBUG = 4 OPTIMIZE = -g CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) +INSTALL = install CC = $(CROSS)g++ LD = $(CROSS)ld AR = $(CROSS)ar @@ -19,5 +20,5 @@ $(OUT): $(OBJ) clean: rm -rf $(OBJ) $(OUT) Makefile.bak *~ install: $(OUT) - cp -f ./$(OUT) /usr/bin/ + $(INSTALL) -D ./$(OUT) $(DESTDIR)/usr/bin/$(OUT) diff --git a/Connector_HTTP/Makefile b/Connector_HTTP/Makefile index 7ccbfc72..75a62ea6 100644 --- a/Connector_HTTP/Makefile +++ b/Connector_HTTP/Makefile @@ -6,6 +6,7 @@ DEBUG = 4 OPTIMIZE = -g CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) -DVERSION=$(VERSION) VERSION = `git describe --tags` +INSTALL = install CC = $(CROSS)g++ LD = $(CROSS)ld AR = $(CROSS)ar @@ -20,7 +21,7 @@ $(OUT): $(OBJ) clean: rm -rf $(OBJ) $(OUT) Makefile.bak *~ install: $(OUT) - cp -f ./$(OUT) /usr/bin/ + $(INSTALL) -D ./$(OUT) $(DESTDIR)/usr/bin/$(OUT) cversion: rm -rf ../util/config.o diff --git a/Connector_RAW/Makefile b/Connector_RAW/Makefile index c6b3ec59..a19ba413 100644 --- a/Connector_RAW/Makefile +++ b/Connector_RAW/Makefile @@ -5,6 +5,7 @@ INCLUDES = DEBUG = 4 OPTIMIZE = -g CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) +INSTALL = install CC = $(CROSS)g++ LD = $(CROSS)ld AR = $(CROSS)ar @@ -19,5 +20,5 @@ $(OUT): $(OBJ) clean: rm -rf $(OBJ) $(OUT) Makefile.bak *~ install: $(OUT) - cp -f ./$(OUT) /usr/bin/ + $(INSTALL) -D ./$(OUT) $(DESTDIR)/usr/bin/$(OUT) diff --git a/Connector_RTMP/Makefile b/Connector_RTMP/Makefile index 0a337458..162b22f8 100644 --- a/Connector_RTMP/Makefile +++ b/Connector_RTMP/Makefile @@ -6,6 +6,7 @@ STATIC = DEBUG = 4 OPTIMIZE = -g CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) -DVERSION=$(VERSION) +INSTALL = install CC = $(CROSS)g++ LD = $(CROSS)ld AR = $(CROSS)ar @@ -21,7 +22,7 @@ $(OUT): $(OBJ) clean: rm -rf $(OBJ) $(OUT) Makefile.bak *~ install: $(OUT) - cp -f ./$(OUT) /usr/bin/ + $(INSTALL) -D ./$(OUT) $(DESTDIR)/usr/bin/$(OUT) cversion: rm -rf ../util/config.o diff --git a/DDV_Controller/Makefile b/DDV_Controller/Makefile index 2782d63f..1ef9613c 100644 --- a/DDV_Controller/Makefile +++ b/DDV_Controller/Makefile @@ -9,6 +9,7 @@ COMPILED_USERNAME = testuser COMPILED_PASSWORD = 179ad45c6ce2cb97cf1029e212046e81 #COMPILED_PASSWORD = testpass CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) -DCOMPILED_USERNAME=$(COMPILED_USERNAME) -DCOMPILED_PASSWORD=$(COMPILED_PASSWORD) -DVERSION=$(VERSION) +INSTALL = install CC = $(CROSS)g++ LD = $(CROSS)ld AR = $(CROSS)ar @@ -24,4 +25,6 @@ clean: rm -rf $(OBJ) $(OUT) Makefile.bak *~ cversion: rm -rf ../util/config.o +install: $(OUT) + $(INSTALL) -D ./$(OUT) $(DESTDIR)/usr/bin/$(OUT)