[planner] To build on 64-bit Windows look for NSIS in multiple locations
- From: Maurice van der Pot <mvdpot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [planner] To build on 64-bit Windows look for NSIS in multiple locations
- Date: Sat, 30 Oct 2010 19:21:10 +0000 (UTC)
commit 970b5b458ca131fbb6b9a69de7cff8ac4951bfb7
Author: Maurice van der Pot <griffon26 kfk4ever com>
Date: Sat Oct 30 20:51:12 2010 +0200
To build on 64-bit Windows look for NSIS in multiple locations
Makefile.win32 | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.win32 b/Makefile.win32
index db4a533..df631f5 100644
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -151,7 +151,14 @@ createinstaller:
mkdir -p $(INSTALLERTMP)/planner/$$(dirname $${file}); \
cp -r $(PREFIX)/$${file} $(INSTALLERTMP)/planner/$$(dirname $${file})/; \
done
- /c/Program\ Files/NSIS/makensis -v3 -DPLANNER_VERSION=$(VERSION) -DSTAGING_DIR=.\\tmp\\planner installer/planner-installer.nsi
+ for MAKENSIS in \
+ /c/Program\ Files/NSIS/makensis \
+ /c/Program\ Files\ \(x86\)/NSIS/makensis; do \
+ if [ -e "$${MAKENSIS}" ]; then \
+ break; \
+ fi; \
+ done; \
+ "$${MAKENSIS}" -v3 -DPLANNER_VERSION=$(VERSION) -DSTAGING_DIR=.\\tmp\\planner installer/planner-installer.nsi
install: install-recursive
install-am:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]