Download as
Browse Code »

Commit ee07ef8a072285a5311f850cac5c4160cb0cfb77

Authored by Lucas Kanashiro
1 parent b261d1fb
Exists in master

Fix conflict file against colab-deps installation 

Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>
Signed-off-by: Paulo Tada <paulohtfs@gmail.com>
Showing 1 changed file with 8 additions and 0 deletions   Show diff stats
Makefile
  Diff comments   View file @ee07ef8
... ... @@ -4,11 +4,13 @@ PREFIX = /usr
4 4 TARGET = $(DESTDIR)$(PREFIX)/lib/colab
5 5 DISTDIR = $(NAME)-$(VERSION)
6 6 TARBALL = dist/$(DISTDIR).tar.gz
  7 +BUILD_LIB = ./build/lib/python2.7
7 8  
8 9  
9 10 all: virtualenv
10 11 ./build/bin/pip install --no-index --find-links=$(DISTDIR) pip==1.5.6
11 12 ./build/bin/pip install --no-index --find-links=$(DISTDIR) --no-deps -r requirements-colab-plugins.txt
  13 + yes y | ./build/bin/pip uninstall pip==1.5.6
12 14 virtualenv --relocatable ./build
13 15  
14 16 clean:
... ... @@ -19,6 +21,12 @@ SOURCES = Makefile requirements-colab-plugins.txt
19 21 install:
20 22 mkdir -p $$(dirname $(TARGET))
21 23 rm -rf $(TARGET)
  24 + rm -rf $(BUILD_LIB)/site-packages/setuptools
  25 + rm -rf $(BUILD_LIB)/distutils
  26 + rm -rf $(BUILD_LIB)/site-packages/_markerlib
  27 + rm -rf $(BUILD_LIB)/site-packages/easy_install.*
  28 + rm -rf $(BUILD_LIB)/site-packages/pkg_resources.*
  29 + rm -rf $(BUILD_LIB)/site.*
22 30 cp -r ./build $(TARGET)
23 31  
24 32  
... ...