summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-07-23 02:09:20 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-23 03:34:16 (GMT)
commit8cc393068aedc7378166ccc013d3954cd87f0deb (patch)
treee01fed085f595dfda06fda1d9c3b263000ffcb8c
parentf6e1a4d6dc4d1b3d82d5e87fdd817b3994dda5e0 (diff)
downloadgit-8cc393068aedc7378166ccc013d3954cd87f0deb.zip
git-8cc393068aedc7378166ccc013d3954cd87f0deb.tar.gz
git-8cc393068aedc7378166ccc013d3954cd87f0deb.tar.bz2
[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>
-rw-r--r--Makefile4
-rw-r--r--tools/Makefile13
2 files changed, 15 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4575cf6..d440f82 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 8e7252e..5c07cec 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