git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Markus Heidelberg <markus.heidelberg@web.de>
To: Marco Costalba <mcostalba@gmail.com>
Cc: git@vger.kernel.org, Markus Heidelberg <markus.heidelberg@web.de>
Subject: [PATCH QGit] Immediately evaluate the ProgramFiles environment variable
Date: Sun, 10 May 2009 11:53:45 +0200	[thread overview]
Message-ID: <1241949225-10046-1-git-send-email-markus.heidelberg@web.de> (raw)

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(-)

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

             reply	other threads:[~2009-05-10  9:57 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-10  9:53 Markus Heidelberg [this message]
2009-05-10 12:09 ` [PATCH QGit] Immediately evaluate the ProgramFiles environment variable Marco Costalba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1241949225-10046-1-git-send-email-markus.heidelberg@web.de \
    --to=markus.heidelberg@web.de \
    --cc=git@vger.kernel.org \
    --cc=mcostalba@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).