summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrzemysław Dolata <snowball91b@gmail.com>2017-11-02 11:46:05 (GMT)
committerGitHub <noreply@github.com>2017-11-02 11:46:05 (GMT)
commite5b3fbe4b9ec0d5ef1c5baa9e432da8f3af2d504 (patch)
tree3b8a0013b9d85ae3edf7c74e15a2c1c8fdfd9fb6
parentd8b4283d1822a3ff26420401f3f692216ad14557 (diff)
parentc209c92fcd5d7097a75dfa17a022ec6b69d028db (diff)
downloadcaffe-e5b3fbe4b9ec0d5ef1c5baa9e432da8f3af2d504.zip
caffe-e5b3fbe4b9ec0d5ef1c5baa9e432da8f3af2d504.tar.gz
caffe-e5b3fbe4b9ec0d5ef1c5baa9e432da8f3af2d504.tar.bz2
Merge pull request #5704 from ArneSuppe/dupDistDirFix
Fixed bug where make distribute duplicates python files
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4d32416..c6d5685 100644
--- a/Makefile
+++ b/Makefile
@@ -694,6 +694,6 @@ $(DISTRIBUTE_DIR): all py | $(DISTRIBUTE_SUBDIRS)
install -m 644 $(DYNAMIC_NAME) $(DISTRIBUTE_DIR)/lib
cd $(DISTRIBUTE_DIR)/lib; rm -f $(DYNAMIC_NAME_SHORT); ln -s $(DYNAMIC_VERSIONED_NAME_SHORT) $(DYNAMIC_NAME_SHORT)
# add python - it's not the standard way, indeed...
- cp -r python $(DISTRIBUTE_DIR)/python
+ cp -r python $(DISTRIBUTE_DIR)/
-include $(DEPS)