From 8cc393068aedc7378166ccc013d3954cd87f0deb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 22 Jul 2005 19:09:20 -0700 Subject: [PATCH] [PATCH] Install tools with "make install-tools". Match the main Makefile by separating COPTS from CFLAGS, defining INSTALL, prefix, and bin. Add a new target 'install-tools' to the main Makefile to install them. Signed-off-by: Junio C Hamano Signed-off-by: Junio C Hamano --- Makefile | 4 ++++ tools/Makefile | 13 +++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4575cf67..d440f829 100644 --- a/Makefile +++ b/Makefile @@ -195,12 +195,16 @@ test: all doc: $(MAKE) -C Documentation all +install-tools: + $(MAKE) -C tools install + install-doc: $(MAKE) -C Documentation install clean: rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE) rm -f git-core-*.tar.gz git-core.spec + $(MAKE) -C tools/ clean $(MAKE) -C Documentation/ clean backup: clean diff --git a/tools/Makefile b/tools/Makefile index 8e7252e5..5c07cec0 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,6 +1,14 @@ +# +# Make Linus git-tools +# CC=gcc -CFLAGS=-Wall -O2 +COPTS=-O2 +CFLAGS=-g $(COPTS) -Wall +INSTALL=install HOME=$(shell echo $$HOME) +prefix=$(HOME) +bin=$(prefix)/bin +# dest= PROGRAMS=mailsplit mailinfo SCRIPTS=applymbox applypatch @@ -8,7 +16,8 @@ SCRIPTS=applymbox applypatch all: $(PROGRAMS) install: $(PROGRAMS) $(SCRIPTS) - cp -f $(PROGRAMS) $(SCRIPTS) $(HOME)/bin/ + $(INSTALL) -m755 -d $(dest)$(bin) + $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(dest)$(bin) clean: rm -f $(PROGRAMS) *.o -- 2.11.0