From ee07ef8a072285a5311f850cac5c4160cb0cfb77 Mon Sep 17 00:00:00 2001
From: Lucas Kanashiro <kanashiro.duarte@gmail.com>
Date: Thu, 10 Mar 2016 15:29:50 -0300
Subject: [PATCH] Fix conflict file against colab-deps installation

---
 Makefile | 8 ++++++++
 1 file changed, 8 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index e34d236..67309d6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,13 @@ PREFIX = /usr
 TARGET = $(DESTDIR)$(PREFIX)/lib/colab
 DISTDIR = $(NAME)-$(VERSION)
 TARBALL = dist/$(DISTDIR).tar.gz
+BUILD_LIB = ./build/lib/python2.7
 
 
 all: virtualenv
 	./build/bin/pip install --no-index --find-links=$(DISTDIR) pip==1.5.6
 	./build/bin/pip install --no-index --find-links=$(DISTDIR) --no-deps -r requirements-colab-plugins.txt
+	yes y | ./build/bin/pip uninstall pip==1.5.6
 	virtualenv --relocatable ./build
 
 clean:
@@ -19,6 +21,12 @@ SOURCES = Makefile requirements-colab-plugins.txt
 install:
 	mkdir -p $$(dirname $(TARGET))
 	rm -rf $(TARGET)
+	rm -rf $(BUILD_LIB)/site-packages/setuptools
+	rm -rf $(BUILD_LIB)/distutils
+	rm -rf $(BUILD_LIB)/site-packages/_markerlib
+	rm -rf $(BUILD_LIB)/site-packages/easy_install.*
+	rm -rf $(BUILD_LIB)/site-packages/pkg_resources.*
+	rm -rf $(BUILD_LIB)/site.*
 	cp -r ./build $(TARGET)
 
 
--
libgit2 0.21.2