fix issues at installation scripts. Change at initopenvim

[osm/openvim.git] / Makefile

diff --git a/Makefile b/Makefile
index 8a16ee1..bae4fe1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ clean:
        find osm_openvim -name '*.pyo' -delete
 
 prepare_lite:
-       pip install --upgrade setuptools
+       pip install --user --upgrade setuptools
        mkdir -p build
        VER1=$(shell git describe | sed -e 's/^v//' |cut -d- -f1); \
        VER2=$(shell git describe | cut -d- -f2); \
@@ -36,9 +36,10 @@ prepare_lite:
        sed -i "s/from osm_openvim/from lib_osm_openvim/g" build/openflow-lib
        sed -i "s/import osm_openvim/import lib_osm_openvim/g" build/openflow-lib
        sed -i "s/import osm_openvim; print osm_openvim\.__path__\[0\]/import lib_osm_openvim; print lib_osm_openvim\.__path__\[0\]/g" build/lib_osm_openvim/database_utils/migrate_vim_db.sh
+       sed -i "s/__import__(\"osm_openvim\.\"/__import__(\"lib_osm_openvim\.\"/g" build/lib_osm_openvim/ovim.py
 
 prepare:
-       pip install --upgrade setuptools
+       pip install --user --upgrade setuptools
        mkdir -p build
        VER1=$(shell git describe | sed -e 's/^v//' |cut -d- -f1); \
        VER2=$(shell git describe | cut -d- -f2); \
@@ -76,14 +77,14 @@ package_openvim: clean prepare
        cd build && cp osm_openvim/scripts/python-osm-openvim.postinst deb_dist/osm-openvim*/debian/
        cd build/deb_dist/osm-openvim* && dpkg-buildpackage -rfakeroot -uc -us
        mkdir -p .build
-       cp build/deb_dist/python-*.deb ./build/
+       cp build/deb_dist/python-*.deb .build/
 
 package_lib: clean prepare_lite
        #apt-get install -y python-stdeb
        cd build && python setup.py --command-packages=stdeb.command sdist_dsc --with-python2=True
        cd build/deb_dist/lib-osm-openvim* && dpkg-buildpackage -rfakeroot -uc -us
        mkdir -p .build
-       cp build/deb_dist/python-*.deb ./build/
+       cp build/deb_dist/python-*.deb .build/
 
 package: clean_deb package_openvim package_lib
 
@@ -91,15 +92,11 @@ snap:
        echo "Nothing to be done yet"
 
 install: clean build
+       #cd build/dist; pip install --user osm_openvim*
        cd build/dist; pip install osm_openvim*
 
 install_lite: clean build_lite
+       #cd build/dist; pip install --user lib_osm_openvim-*
        cd build/dist; pip install lib_osm_openvim-*
 
 
-
-
-
-
-
-