Use coreutils' install command, support DESTDIR

This commit is contained in:
Lekensteyn 2012-04-22 15:37:00 +02:00
parent f527bc5d45
commit 51c760eef7
5 changed files with 11 additions and 4 deletions

View file

@ -5,6 +5,7 @@ INCLUDES =
DEBUG = 4 DEBUG = 4
OPTIMIZE = -g OPTIMIZE = -g
CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG)
INSTALL = install
CC = $(CROSS)g++ CC = $(CROSS)g++
LD = $(CROSS)ld LD = $(CROSS)ld
AR = $(CROSS)ar AR = $(CROSS)ar
@ -19,5 +20,5 @@ $(OUT): $(OBJ)
clean: clean:
rm -rf $(OBJ) $(OUT) Makefile.bak *~ rm -rf $(OBJ) $(OUT) Makefile.bak *~
install: $(OUT) install: $(OUT)
cp -f ./$(OUT) /usr/bin/ $(INSTALL) -D ./$(OUT) $(DESTDIR)/usr/bin/$(OUT)

View file

@ -6,6 +6,7 @@ DEBUG = 4
OPTIMIZE = -g OPTIMIZE = -g
CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) -DVERSION=$(VERSION) CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) -DVERSION=$(VERSION)
VERSION = `git describe --tags` VERSION = `git describe --tags`
INSTALL = install
CC = $(CROSS)g++ CC = $(CROSS)g++
LD = $(CROSS)ld LD = $(CROSS)ld
AR = $(CROSS)ar AR = $(CROSS)ar
@ -20,7 +21,7 @@ $(OUT): $(OBJ)
clean: clean:
rm -rf $(OBJ) $(OUT) Makefile.bak *~ rm -rf $(OBJ) $(OUT) Makefile.bak *~
install: $(OUT) install: $(OUT)
cp -f ./$(OUT) /usr/bin/ $(INSTALL) -D ./$(OUT) $(DESTDIR)/usr/bin/$(OUT)
cversion: cversion:
rm -rf ../util/config.o rm -rf ../util/config.o

View file

@ -5,6 +5,7 @@ INCLUDES =
DEBUG = 4 DEBUG = 4
OPTIMIZE = -g OPTIMIZE = -g
CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG)
INSTALL = install
CC = $(CROSS)g++ CC = $(CROSS)g++
LD = $(CROSS)ld LD = $(CROSS)ld
AR = $(CROSS)ar AR = $(CROSS)ar
@ -19,5 +20,5 @@ $(OUT): $(OBJ)
clean: clean:
rm -rf $(OBJ) $(OUT) Makefile.bak *~ rm -rf $(OBJ) $(OUT) Makefile.bak *~
install: $(OUT) install: $(OUT)
cp -f ./$(OUT) /usr/bin/ $(INSTALL) -D ./$(OUT) $(DESTDIR)/usr/bin/$(OUT)

View file

@ -6,6 +6,7 @@ STATIC =
DEBUG = 4 DEBUG = 4
OPTIMIZE = -g OPTIMIZE = -g
CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) -DVERSION=$(VERSION) CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) -DVERSION=$(VERSION)
INSTALL = install
CC = $(CROSS)g++ CC = $(CROSS)g++
LD = $(CROSS)ld LD = $(CROSS)ld
AR = $(CROSS)ar AR = $(CROSS)ar
@ -21,7 +22,7 @@ $(OUT): $(OBJ)
clean: clean:
rm -rf $(OBJ) $(OUT) Makefile.bak *~ rm -rf $(OBJ) $(OUT) Makefile.bak *~
install: $(OUT) install: $(OUT)
cp -f ./$(OUT) /usr/bin/ $(INSTALL) -D ./$(OUT) $(DESTDIR)/usr/bin/$(OUT)
cversion: cversion:
rm -rf ../util/config.o rm -rf ../util/config.o

View file

@ -9,6 +9,7 @@ COMPILED_USERNAME = testuser
COMPILED_PASSWORD = 179ad45c6ce2cb97cf1029e212046e81 COMPILED_PASSWORD = 179ad45c6ce2cb97cf1029e212046e81
#COMPILED_PASSWORD = testpass #COMPILED_PASSWORD = testpass
CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) -DCOMPILED_USERNAME=$(COMPILED_USERNAME) -DCOMPILED_PASSWORD=$(COMPILED_PASSWORD) -DVERSION=$(VERSION) CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) -DCOMPILED_USERNAME=$(COMPILED_USERNAME) -DCOMPILED_PASSWORD=$(COMPILED_PASSWORD) -DVERSION=$(VERSION)
INSTALL = install
CC = $(CROSS)g++ CC = $(CROSS)g++
LD = $(CROSS)ld LD = $(CROSS)ld
AR = $(CROSS)ar AR = $(CROSS)ar
@ -24,4 +25,6 @@ clean:
rm -rf $(OBJ) $(OUT) Makefile.bak *~ rm -rf $(OBJ) $(OUT) Makefile.bak *~
cversion: cversion:
rm -rf ../util/config.o rm -rf ../util/config.o
install: $(OUT)
$(INSTALL) -D ./$(OUT) $(DESTDIR)/usr/bin/$(OUT)