Home » Mailing list archives » git » 2008 » July » 14

[PATCH 0/5] replacement for the part of js/more-win that is in pu

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Johannes Sixt <johannes.sixt@...>
To: Junio C Hamano <gitster@...>
Cc: Steffen Prohaska <prohaska@...>, <git@...>, Johannes Sixt <johannes.sixt@...>
Subject: [PATCH 0/5] replacement for the part of js/more-win that is in pu
Date: Monday, July 14, 2008 - 5:41 pm

The interdiff to js/more-win is below. It is mostly the changes
of 1/5.

Johannes Sixt (5):
      Makefile: Normalize $(bindir) and $(gitexecdir) before comparing
      Record the command invocation path early
      Fix relative built-in paths to be relative to the command
         invocation
      Allow the built-in exec path to be relative to the command
         invocation path
      Allow add_path() to add non-existent directories to the path


 Makefile       |   33 +++++++++++++++++-----------
 abspath.c      |   36 ++++++++++++++++++++++++++++++
 exec_cmd.c     |   54 +++++++++++----------------------------------
 exec_cmd.h     |    3 +-
 git.c          |    5 +--
 path.c         |   36 ------------------------------
 receive-pack.c |    2 +-
 shell.c        |    4 +-
 upload-pack.c  |    2 +-
 9 files changed, 77 insertions(+), 98 deletions(-)


diff --git a/Makefile b/Makefile
index 3593e6f..4df6423 100644
--- a/Makefile
+++ b/Makefile
@@ -1301,14 +1301,14 @@ remove-dashes:
 ### Installation rules
 
 ifeq ($(firstword $(subst /, ,$(template_dir))),..)
-template_instdir = $(shell cd '$(bindir_SQ)/$(template_dir_SQ)' && pwd)
+template_instdir = $(bindir)/$(template_dir)
 else
 template_instdir = $(template_dir)
 endif
 export template_instdir
 
 ifeq ($(firstword $(subst /, ,$(gitexecdir))),..)
-gitexec_instdir = $(shell cd '$(bindir_SQ)/$(gitexecdir_SQ)' && pwd)
+gitexec_instdir = $(bindir)/$(gitexecdir)
 else
 gitexec_instdir = $(gitexecdir)
 endif
@@ -1325,18 +1325,18 @@ ifndef NO_TCLTK
 	$(MAKE) -C gitk-git install
 	$(MAKE) -C git-gui install
 endif
-	if test 'z$(bindir_SQ)' != 'z$(gitexec_instdir_SQ)'; \
-	then \
-		ln -f '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
-			'$(DESTDIR_SQ)$(gitexec_instdir_SQ)/git$X' || \
-		cp '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
-			'$(DESTDIR_SQ)$(gitexec_instdir_SQ)/git$X'; \
-	fi
-	$(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p' ;)
 ifneq (,$X)
 	$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p';)
 endif
-	./check_bindir 'z$(bindir_SQ)' 'z$(gitexec_instdir_SQ)' '$(DESTDIR_SQ)$(bindir_SQ)/git-shell$X'
+	bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
+	execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
+	if test "z$$bindir" != "z$$execdir"; \
+	then \
+		ln -f "$$bindir/git$X" "$$execdir/git$X" || \
+		cp "$$bindir/git$X" "$$execdir/git$X"; \
+	fi && \
+	{ $(foreach p,$(BUILT_INS), $(RM) "$$execdir/$p" && ln "$$execdir/git$X" "$$execdir/$p" ;) } && \
+	./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-shell$X"
 
 install-doc:
 	$(MAKE) -C Documentation install
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
Re: [PATCH 3/3 FIXED] help (Windows): Display HTML in defaul..., Junio C Hamano, (Sun Jul 13, 4:58 am)
[PATCH] Move code interpreting path relative to exec-dir to ..., Johannes Sixt, (Sun Jul 13, 4:31 pm)
[PATCH] help.c: Add support for htmldir relative to git_exec..., Johannes Sixt, (Sun Jul 13, 4:31 pm)
[PATCH] help (Windows): Display HTML in default browser usin..., Johannes Sixt, (Sun Jul 13, 4:31 pm)
[PATCH] Fix relative built-in paths to be relative to the co..., Johannes Sixt, (Sun Jul 13, 4:31 pm)
Re: [PATCH] Fix relative built-in paths to be relative to th..., Johannes Schindelin, (Sun Jul 13, 4:43 pm)
Re: [PATCH] Fix relative built-in paths to be relative to th..., Johannes Sixt, (Mon Jul 14, 4:47 am)
[PATCH 0/5] replacement for the part of js/more-win that is ..., Johannes Sixt, (Mon Jul 14, 5:41 pm)
Re: [PATCH 0/5] replacement for the part of js/more-win that..., Johannes Sixt, (Tue Jul 15, 3:59 am)
[PATCH 1/5] Makefile: Normalize $(bindir) and $(gitexecdir) ..., Johannes Sixt, (Mon Jul 14, 5:41 pm)
[PATCH 2/5] Record the command invocation path early, Johannes Sixt, (Mon Jul 14, 5:41 pm)
[PATCH 3/5] Fix relative built-in paths to be relative to th..., Johannes Sixt, (Mon Jul 14, 5:41 pm)
[PATCH 4/5] Allow the built-in exec path to be relative to t..., Johannes Sixt, (Mon Jul 14, 5:41 pm)
[PATCH 5/5] Allow add_path() to add non-existent directories..., Johannes Sixt, (Mon Jul 14, 5:41 pm)
Re: [PATCH] Fix relative built-in paths to be relative to th..., Johannes Sixt, (Mon Jul 14, 2:55 am)
Re: [PATCH] Fix relative built-in paths to be relative to th..., Johannes Schindelin, (Mon Jul 14, 8:20 am)
Re: [PATCH] Fix relative built-in paths to be relative to th..., Johannes Sixt, (Mon Jul 14, 2:54 pm)
Re: [PATCH] Fix relative built-in paths to be relative to th..., Junio C Hamano, (Mon Jul 14, 3:03 pm)
[PATCH] Allow the built-in exec path to be relative to the c..., Johannes Sixt, (Sun Jul 13, 4:31 pm)
Re: [PATCH] Allow the built-in exec path to be relative to t..., Johannes Schindelin, (Sun Jul 13, 4:45 pm)
[PATCH] Allow add_path() to add non-existent directories to ..., Johannes Sixt, (Sun Jul 13, 4:31 pm)
Re: [PATCH] Allow add_path() to add non-existent directories..., Johannes Sixt, (Mon Jul 14, 3:13 am)