Don't use build directory by default

hluk · Jun 6, 2016 · e3ec857 · e3ec857
1 parent 798f321
commit e3ec857
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -138,3 +138,8 @@ Implementation
 There are appropriate signals emitted for command which has to be processed by the underlying editor widget (folds, windows, tabs, command line, messages etc.).
 See example in `test/` directory or implementation of FakeVim plugin in Qt Creator IDE.
 
+Python Bindings
+---------------
+
+To install Python bindings for FakeVim see "python/README.md" file.
+
diff --git a/python/README.md b/python/README.md
@@ -8,14 +8,18 @@ Few notes:
  * Compile FakeVim library and binndings with same version of Qt.
  * Use same major version of python to build and run.
 
-To build run bash script `build.sh` or just create `build` sub-directory in
-this directory and from there run `configure.py`, `qmake` and `make`.
+To build and install run following commands from this directory.
 
-To install run `make install` from `build` sub-directory.
+```bash
+./configure.py
+qmake
+make install
+```
 
 On Ubuntu 14.04, package `pyqt5-dev` must be installed. Additionally build
 script needs to be invoked with following command.
+
 ```
-PYTHON=python3 ./build.sh
+python3 ./configure.py
 ```
 
diff --git a/python/build.sh b/python/build.sh
@@ -12,7 +12,7 @@ export SIP=${SIP:-sip}
 export PYTHON=${PYTHON:-python}
 
 # Project and library paths
-export PROJECT_PATH=${PROJECT_PATH:-"$PWD"}
+export PROJECT_PATH=${PROJECT_PATH:-"$PWD/.."}
 export LIBRARY_PATH=${LIBRARY_PATH:-"$PROJECT_PATH/fakevim"}
 export SIP_FILE_PATH=${SIP_FILE_PATH:-"$PROJECT_PATH/python/fakevim.sip"}
 

diff --git a/python/configure.py b/python/configure.py
@@ -56,7 +56,7 @@ def main():
     sipConfig = sipconfig.Configuration()
     config = Config(qmakePath)
 
-    projectPath = getEnv('PROJECT_PATH', '../..')
+    projectPath = getEnv('PROJECT_PATH', '..')
     libraryPath = getEnv('LIBRARY_PATH', projectPath + '/fakevim')
     sipFilePath = getEnv('SIP_FILE_PATH', projectPath + '/python/fakevim.sip')
     pyQtIncludePath = getEnv('PYQT_INCLUDE_PATH',