[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 <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index 4575cf6727041c001c75688ef5a93fb6c4d449d0..d440f82967cbdd18b2045ee798f28a13821a096d 100644 (file)
--- 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 8e7252e592e1eab9cdacdb12a09ce9cd5ab5528e..5c07cec0eaf51ee4421712f60bdbfd3fc21a3dcd 100644 (file)
--- 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