aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-06-02 21:05:13 -0400
committerShawn O. Pearce <spearce@spearce.org>2007-06-02 21:05:13 -0400
commit22faa032cae39b6758c5a83778bf9bd87305bbd4 (patch)
treeb96635fa06b8fc955c09c33b063ad2dafdd05608 /Makefile
parentf7e1d2d4ac53e93fb2c79bd65c9f3dbfbc9c2024 (diff)
parentcb8773d16c8619901f46a96ecfc5c2b11c2e82a2 (diff)
downloadgit-22faa032cae39b6758c5a83778bf9bd87305bbd4.tar.xz
Merge branch 'maint'
* maint: Revert "Make the installation target of git-gui a little less chatty" git-gui: Verify Tcl/Tk is new enough for our needs git-gui: Attach font_ui to all spinbox widgets
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile20
1 files changed, 6 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 404bff0ad9..3de0de1a23 100644
--- a/Makefile
+++ b/Makefile
@@ -2,12 +2,6 @@ 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
@@ -115,14 +109,12 @@ GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
all:: $(ALL_PROGRAMS) lib/tclIndex
install: all
- $(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)' ;)
+ $(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)' ;)
dist-version:
@mkdir -p $(TARDIR)