From: Shawn O. Pearce <spearce@spearce.org>
Date: Fri, 14 Sep 2007 00:13:59 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: gitgui-0.9.0~72
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4baba57f8d7bfee85ca1e521e1f6069923504799;p=git.git

Merge branch 'maint'

* maint:
  git-gui: Paper bag fix "Commit->Revert" format arguments
  git-gui: Provide 'uninstall' Makefile target to undo an installation
  git-gui: Font chooser to handle a large number of font families
---

4baba57f8d7bfee85ca1e521e1f6069923504799
diff --cc Makefile
index 5b1ff9149,18e675013..8c87d836d
--- a/Makefile
+++ b/Makefile
@@@ -162,17 -160,26 +177,31 @@@ install: al
  	$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(INSTALL_D1)
  	$(QUIET)$(INSTALL_R0)lib/tclIndex $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)'
  	$(QUIET)$(foreach p,$(ALL_LIBFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)' &&) true
 +	$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(INSTALL_D1)
 +	$(QUIET)$(foreach p,$(ALL_MSGFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
  
+ uninstall:
+ 	$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
+ 	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/git-gui $(REMOVE_F1)
+ 	$(QUIET)$(foreach p,$(GITGUI_BUILT_INS), $(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/$p $(REMOVE_F1) &&) true
+ 	$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(libdir_SQ)'
+ 	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/tclIndex $(REMOVE_F1)
+ 	$(QUIET)$(foreach p,$(ALL_LIBFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
++	$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(msgsdir_SQ)'
++	$(QUIET)$(foreach p,$(ALL_MSGFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
+ 	$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(REMOVE_D1)
++	$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(REMOVE_D1)
+ 	$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(REMOVE_D1)
+ 	$(QUIET)$(REMOVE_D0)`dirname '$(DESTDIR_SQ)$(libdir_SQ)'` $(REMOVE_D1)
+ 
  dist-version:
  	@mkdir -p $(TARDIR)
  	@echo $(GITGUI_VERSION) > $(TARDIR)/version
  
  clean::
 -	rm -f $(ALL_PROGRAMS) lib/tclIndex
 +	rm -f $(ALL_PROGRAMS) lib/tclIndex po/*.msg
  	rm -f GIT-VERSION-FILE GIT-GUI-VARS
  
- .PHONY: all install dist-version clean
+ .PHONY: all install uninstall dist-version clean
  .PHONY: .FORCE-GIT-VERSION-FILE
  .PHONY: .FORCE-GIT-GUI-VARS