Removed trailing comments from Makefile.config

This is to avoid evaluation errors.
BVLC · Jun 18, 2015 · 3cdff52 · 3cdff52
1 parent 7078913
commit 3cdff52
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Makefile.config.example b/Makefile.config.example
@@ -7,12 +7,12 @@
 # CPU-only switch (uncomment to build without GPU support).
 # CPU_ONLY := 1
 
-# Comment out to disable IO dependencies
-USE_LEVELDB := 1 # {IO-flag}
-USE_LMDB := 1    # {IO-flag}
-USE_HDF5 := 1    # {IO-flag}
-USE_OPENCV := 1  # {IO-flag}
-USE_SNAPPY := 1  # {IO-flag}
+# comment out to disable IO dependencies
+USE_LEVELDB := 1
+USE_LMDB := 1
+USE_HDF5 := 1
+USE_OPENCV := 1
+USE_SNAPPY := 1
 
 # To customize your choice of compiler, uncomment and set the following.
 # N.B. the default for Linux is g++ and the default for OSX is clang++

diff --git a/scripts/travis/travis_setup_makefile_config.sh b/scripts/travis/travis_setup_makefile_config.sh
@@ -13,7 +13,11 @@ fi
 
 # Remove IO library settings from Makefile.config
 # to avoid conflicts with CI configuration
-sed -i -e '/{IO-flag}/d' Makefile.config
+sed -i -e '/USE_LMDB/d' Makefile.config
+sed -i -e '/USE_LEVELDB/d' Makefile.config
+sed -i -e '/USE_OPENCV/d' Makefile.config
+sed -i -e '/USE_HDF5/d' Makefile.config
+sed -i -e '/USE_SNAPPY/d' Makefile.config
 
 cat << 'EOF' >> Makefile.config
 ANACONDA_HOME := $(HOME)/miniconda