diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-07 07:51:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-07 07:51:15 (GMT) |
| commit | d9f405931fa3d96b2a80fe5ad8205eea7c443f56 (patch) | |
| tree | b1ebb40e8ede5b364eef9ddb70f92fbf51486c4d /git-gui/Makefile | |
| parent | 5f7003b18cf84c0629eada39bca417d9c33cb132 (diff) | |
| parent | cfb5e104423b51aefb4d0e21a093bd9373b0af0b (diff) | |
| download | git-d9f405931fa3d96b2a80fe5ad8205eea7c443f56.zip git-d9f405931fa3d96b2a80fe5ad8205eea7c443f56.tar.gz git-d9f405931fa3d96b2a80fe5ad8205eea7c443f56.tar.bz2 | |
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui:
Update Hungarian translation. 100% completed.
Update ja.po for git-gui
git-gui: Improve the application icon on Windows.
git-gui: install-sh from automake does not like -m755
git-gui: Reorder msgfmt command-line arguments
Update German translation. 100% completed.
Update git-gui.pot with latest (few) string additions and changes.
git-gui: update it.po and glossary/it.po
git-gui: fix a typo in lib/commit.tcl
Diffstat (limited to 'git-gui/Makefile')
| -rw-r--r-- | git-gui/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile index e860319..26ac4b6 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@ -43,11 +43,11 @@ endif RM_RF ?= rm -rf RMDIR ?= rmdir -INSTALL_D0 = $(INSTALL) -d -m755 # space is required here +INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here INSTALL_D1 = -INSTALL_R0 = $(INSTALL) -m644 # space is required here +INSTALL_R0 = $(INSTALL) -m 644 # space is required here INSTALL_R1 = -INSTALL_X0 = $(INSTALL) -m755 # space is required here +INSTALL_X0 = $(INSTALL) -m 755 # space is required here INSTALL_X1 = INSTALL_A0 = find # space is required here INSTALL_A1 = | cpio -pud @@ -71,11 +71,11 @@ ifndef V QUIET_2DEVNULL = 2>/dev/null INSTALL_D0 = dir= - INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m755 "$$dir" + INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir" INSTALL_R0 = src= - INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m644 $$src + INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src INSTALL_X0 = src= - INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m755 $$src + INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src INSTALL_A0 = src= INSTALL_A1 = && echo ' ' INSTALL ' ' `basename "$$src"` && find "$$src" | cpio -pud @@ -212,7 +212,7 @@ $(PO_TEMPLATE): $(SCRIPT_SH) $(ALL_LIBFILES) update-po:: $(PO_TEMPLATE) $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; ) $(ALL_MSGFILES): %.msg : %.po - $(QUIET_MSGFMT0)$(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@) $(QUIET_MSGFMT1) + $(QUIET_MSGFMT0)$(MSGFMT) --statistics --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< $(QUIET_MSGFMT1) lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS $(QUIET_INDEX)if echo \ |