From 656ee71bbc9fb2a3f4830115483dc04ce42837f1 Mon Sep 17 00:00:00 2001
From: Arnaud Diederen <Arnaud Diederen arnaud@hex-rays.com>
Date: Fri, 8 Jan 2016 15:54:26 +0100
Subject: [PATCH] Fix 'dist' phase on windows

---
 BUILDING.txt | 33 ++++++++++++++++++++++++---------
 makefile     |  5 ++---
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index cd09343..85862fc 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -41,21 +41,33 @@ Make sure all the needed tools (compiler, swig) are on the PATH.
 
 1. Unpack the IDA SDK into:
    '.../idasdk69'
-   and run 'make' to make sure it compiles
 
 Note: the path you unpack the IDA SDK into cannot contain white spaces,
    or special characters (such as '(', etc...)
+
+
+2. Making sure the SDK compiles:
+   If you are on:
+    - Windows: set environment variable __NT__=1
+    - Linux: set environment variable __LINUX__=1
+    - Mac OSX: set environment variable __MAC__=1
+
+   then, run 'make'
+
+
+3. Place the IDAPython sources into the SDK directory, such that the file:
+   '.../idasdk69/plugins/idapython/BUILDING.txt' exists
+
+Note: To build with Hex-Rays decompiler support, you will need to copy
+   .../ida_install/plugins/hexrays_sdk/include/hexrays.hpp -> .../idasdk69/include/hexrays.hpp
+
 Note: on Windows, you will also have to
    - copy .../idasdk69/lib/x86_win_vc_32 -> .../idasdk69/lib/x86_win_vc_32_opt
    - copy .../idasdk69/lib/x86_win_vc_64 -> .../idasdk69/lib/x86_win_vc_64_opt
+   This is a kludge, which we will solve for the next version
 
-2. Place these IDAPython sources into the SDK directory, such that the file:
-   '.../idasdk69/plugins/idapython/BUILDING.txt' exists
 
-Note: To build with Hex-Rays decompiler support, please copy hexrays.hpp from
-      the decompiler SDK folder into IDA's include folder (in the SDK).
-
-3. Build the plugin
+4. Build the plugin
 
    python build.py
 
@@ -64,9 +76,12 @@ Note: To build with Hex-Rays decompiler support, please copy hexrays.hpp from
 
    Run 'build.py --help' for more information.
 
-4. Install the components as described in README.txt
 
-See build.py for build details and possible tweaks.
+5. Install the components as described in README.md
+
+
+MISC
+----
 
 On 64 bits distributions, you may need to compile Python to generate a 32bit
 version of the interpreter:
diff --git a/makefile b/makefile
index 33e31ba..913d594 100644
--- a/makefile
+++ b/makefile
@@ -26,7 +26,6 @@ all:
 	@echo "Not building Python for Linux x64"
 else
 
-IDAPYTHON_DIR=$(shell pwd)
 PROC=python
 STRIPOBJS=idaapi.cpp
 API_CONTENTS=api_contents.txt
@@ -77,7 +76,7 @@ PYTHON_VERSION_MINOR?=7
 IDAPYTHON_VERSION_MAJOR=6
 IDAPYTHON_VERSION_MINOR=9
 IDAPYTHON_VERSION_PATCH=0
-PACKAGE_NAME="idapython-$(IDAPYTHON_VERSION_MAJOR).$(IDAPYTHON_VERSION_MINOR).$(IDAPYTHON_VERSION_PATCH)-python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)-$(SYSNAME).zip"
+PACKAGE_NAME=idapython-$(IDAPYTHON_VERSION_MAJOR).$(IDAPYTHON_VERSION_MINOR).$(IDAPYTHON_VERSION_PATCH)-python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)-$(SYSNAME).zip
 
 
 # HIJACK the $(I) variable to point to our staging SDK
@@ -384,7 +383,7 @@ dist: $(BINARY) pyfiles $(DIST_OTHER_TARGETS) | dist_bin dist_cfg
 	rsync -a python $(DIST)/
 
 package:
-	(cd $(DIST) && zip -r $(IDAPYTHON_DIR)/$(PACKAGE_NAME) *)
+	(cd $(DIST) && zip -r ../../$(PACKAGE_NAME) *)
 
 
 # MAKEDEP dependency list ------------------