Added LICENSE file to root folder

[osm/openvim.git] / Makefile

diff --git a/Makefile b/Makefile
index 553d349..7078597 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,9 +24,9 @@ clean_build:
 prepare_lite:
        #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); \
-       #VER3=$(shell git describe | cut -d- -f3); \
+       #VER1=$(shell git describe --match v*| sed -e 's/^v//' |cut -d- -f1); \
+       #VER2=$(shell git describe --match v*| cut -d- -f2); \
+       #VER3=$(shell git describe --match v*| cut -d- -f3); \
        #echo "$$VER1.dev$$VER2+$$VER3" > build/OVIM_VERSION
        cp tox.ini build/
        cp MANIFEST.in build/
@@ -46,15 +46,16 @@ prepare_lite:
        cp openflow build/openflow-lib
        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\.\"/__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 --user --upgrade setuptools
        mkdir -p build
-       #VER1=$(shell git describe | sed -e 's/^v//' |cut -d- -f1); \
-       #VER2=$(shell git describe | cut -d- -f2); \
-       #VER3=$(shell git describe | cut -d- -f3); \
+       #VER1=$(shell git describe --match v*| sed -e 's/^v//' |cut -d- -f1); \
+       #VER2=$(shell git describe --match v*| cut -d- -f2); \
+       #VER3=$(shell git describe --match v*| cut -d- -f3); \
        #echo "$$VER1.dev$$VER2+$$VER3" > build/OPENVIM_VERSION
        cp tox.ini build/
        cp MANIFEST.in build/