[PATCH QGit] Immediately evaluate the ProgramFiles environment variable

Markus Heidelberg· May 10, 2009, 09:53 UTC · lore

Commit 50d839b (Don't hardcode GIT_EXEC_DIR for Windows so much, 2009-04-18) broke 'make install' on Windows. Somehow the current working directory was prepended to the install path given with target.path, when $(ProgramFiles) should be evaluated during the call of 'make'. This seems to be a qmake bug with generating the Makefile.

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
---

For clarification: $ cd C:\projects\qgit4\src $ qmake src.pro -win32 -o Makefile

Now the install_target and uninstall_target targets in Makefile.{Debug,Release} are wrong, for example

uninstall_target:  FORCE
	-$(DEL_FILE) "c:$(INSTALL_ROOT)\projects\qgit\src\$(ProgramFiles)\Git\bin\$(TARGET)"
	-$(DEL_DIR) $(INSTALL_ROOT)"c:\projects\qgit\src\$(ProgramFiles)\Git\bin\"

instead of

uninstall_target:  FORCE
	-$(DEL_FILE) "c:$(INSTALL_ROOT)\Programme\Git\bin\$(TARGET)"
	-$(DEL_DIR) c:$(INSTALL_ROOT)\Programme\Git\bin

Hmm, seems as if there is another bug: $(INSTALL_ROOT)"c: vs. c:$(INSTALL_ROOT)

Sorry for this and for noticing it just a bit too late. I haven't called 'make install' before.

 src/src.pro |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to src/src.pro +1 −1

diff --git a/src/src.pro b/src/src.pro
index 619a9a8..133e64c 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,6 +1,6 @@
 # Under Windows launch script start_qgit.bat needs the
 # value GIT_EXEC_DIR to be set to the git bin directory
-GIT_EXEC_DIR = "$(ProgramFiles)\\Git\\bin"
+GIT_EXEC_DIR = "$$(ProgramFiles)\\Git\\bin"
 
 # Under Windows uncomment following line to enable console messages
 #CONFIG += ENABLE_CONSOLE_MSG

-- 
1.6.3.20.g687dc

Marco Costalba· May 10, 2009, 12:09 UTC · re: Markus Heidelberg · lore

Re: [PATCH QGit] Immediately evaluate the ProgramFiles environment variable

On Sun, May 10, 2009 at 11:53, Markus Heidelberg <markus.heidelberg@web.de> wrote:

Show 8 quoted lines

> Commit 50d839b (Don't hardcode GIT_EXEC_DIR for Windows so much,
> 2009-04-18) broke 'make install' on Windows. Somehow the current working
> directory was prepended to the install path given with target.path, when
> $(ProgramFiles) should be evaluated during the call of 'make'.
> This seems to be a qmake bug with generating the Makefile.
>
> Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
> ---

Thanks, patch applied and pushed.

patchImmediately evaluate the ProgramFiles environment variable