aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-06-01 23:28:15 -0400
committerShawn O. Pearce <spearce@spearce.org>2007-06-01 23:28:15 -0400
commitf7e1d2d4ac53e93fb2c79bd65c9f3dbfbc9c2024 (patch)
tree77b9694b737de66e995a726b404f0a0ee7969067 /Makefile
parentfc4e8da727d5c1737322b14386282456fd3c99c9 (diff)
parent160e82284eda034fea84dcc946f9c1965176f25f (diff)
downloadgit-f7e1d2d4ac53e93fb2c79bd65c9f3dbfbc9c2024.tar.xz
Merge branch 'maint'
* maint: git-gui: Don't quit when we destroy a child widget Make the installation target of git-gui a little less chatty
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile20
1 files changed, 14 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 3de0de1a23..404bff0ad9 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,12 @@ all::
# Define V=1 to have a more verbose compile.
#
+QUIET =
+QUIET_MSG = :
+ifndef V
+ QUIET = @
+ QUIET_MSG = echo ' '
+endif
GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
@$(SHELL_PATH) ./GIT-VERSION-GEN
@@ -109,12 +115,14 @@ GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
all:: $(ALL_PROGRAMS) lib/tclIndex
install: all
- $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
- $(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)'
- $(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
- $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(libdir_SQ)'
- $(INSTALL) -m644 lib/tclIndex '$(DESTDIR_SQ)$(libdir_SQ)'
- $(foreach p,$(ALL_LIBFILES), $(INSTALL) -m644 $p '$(DESTDIR_SQ)$(libdir_SQ)' ;)
+ $(QUIET)$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
+ $(QUIET)$(QUIET_MSG)INSTALL git-gui; $(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)'
+ $(QUIET)$(foreach p,$(GITGUI_BUILT_INS),$(QUIET_MSG)INSTALL $p;\
+ rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && \
+ ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
+ $(QUIET)$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(libdir_SQ)'
+ $(QUIET)$(foreach p,lib/tclIndex $(ALL_LIBFILES), $(QUIET_MSG)INSTALL $p;\
+ $(INSTALL) -m644 $p '$(DESTDIR_SQ)$(libdir_SQ)' ;)
dist-version:
@mkdir -p $(TARDIR)