Home » Mailing list archives » git » 2007 » September » 27

[PATCH 2/2] winworddiff: Check the path to winword.exe during the installation.

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Johannes Sixt <johannes.sixt@...>
To: <git@...>, <msysgit@...>
Cc: Johannes Sixt <johannes.sixt@...>
Subject: [PATCH 2/2] winworddiff: Check the path to winword.exe during the installation.
Date: Thursday, September 27, 2007 - 7:45 am

Since we do not find the path to winword.exe automatically, but rely on
what the user has told us, we better check the path for plausibility.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
---
 contrib/winword/diff/Makefile |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/contrib/winword/diff/Makefile b/contrib/winword/diff/Makefile
index 61de940..91b9328 100644
--- a/contrib/winword/diff/Makefile
+++ b/contrib/winword/diff/Makefile
@@ -1,3 +1,4 @@
+# You can override any of these from ../../../config.mak
 prefix = $(HOME)
 bindir = $(prefix)/bin
 datadir = $(prefix)/share/winworddiff
@@ -8,6 +9,9 @@ INSTALL = install
 all: winworddiff winworddiff.dot
 
 winworddiff: winworddiff.sh
+ifndef FORCE
+	exec < "$(WINWORDEXE)"	# check existence; override with 'make FORCE=1'
+endif
 	sed	-e 's|@@WINWORDEXE@@|$(WINWORDEXE)|' \
 		-e 's|@@PREFIX@@|$(prefix)|' \
 		< $@.sh > $@
-- 
1.5.3.3.gcc9e

-
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:
[PATCH 1/2] contrib: Add diff viewing capability for Microso..., Johannes Sixt, (Thu Sep 27, 7:45 am)
Re: [msysGit] [PATCH 1/2] contrib: Add diff viewing capabili..., Johannes Schindelin, (Thu Sep 27, 8:04 am)
[PATCH 2/2] winworddiff: Check the path to winword.exe durin..., Johannes Sixt, (Thu Sep 27, 7:45 am)