diff options
| -rw-r--r-- | data/Makefile.am | 4 | ||||
| -rwxr-xr-x | travis/osx/before_install.sh | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index a4446287..1bf95cd2 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -64,7 +64,7 @@ proj.db: $(DATAPATH)/sql/*.sql for x in $(SQL_ORDERED_LIST); do \ export SQL_EXPANDED_LIST="$${SQL_EXPANDED_LIST} $(DATAPATH)/$$x"; \ done; \ - if test "x$(PROJ_DB_CACHE_DIR)" != "x" -a -f "$(PROJ_DB_CACHE_DIR)/proj.db" -a -f "$(PROJ_DB_CACHE_DIR)/proj.db.sql.md5" ; then \ + if test "x$(PROJ_DB_CACHE_DIR)" != "x" -a -x "$$(command -v md5sum)" -a -f "$(PROJ_DB_CACHE_DIR)/proj.db" -a -f "$(PROJ_DB_CACHE_DIR)/proj.db.sql.md5" ; then \ cat $${SQL_EXPANDED_LIST} | md5sum | diff - "$(PROJ_DB_CACHE_DIR)/proj.db.sql.md5" > /dev/null \ && (echo "Reusing cached proj.db"; cp "$(PROJ_DB_CACHE_DIR)/proj.db" proj.db); \ fi; \ @@ -84,7 +84,7 @@ proj.db: $(DATAPATH)/sql/*.sql $(RM) proj.db; \ exit 1; \ else \ - if test "x$(PROJ_DB_CACHE_DIR)" != "x" ; then \ + if test "x$(PROJ_DB_CACHE_DIR)" != "x" -a -x "$$(command -v md5sum)" ; then \ mkdir -p "$(PROJ_DB_CACHE_DIR)"; \ cat $${SQL_EXPANDED_LIST} | md5sum > "$(PROJ_DB_CACHE_DIR)/proj.db.sql.md5"; \ cp proj.db "$(PROJ_DB_CACHE_DIR)"; \ diff --git a/travis/osx/before_install.sh b/travis/osx/before_install.sh index a5d40af5..964fbc67 100755 --- a/travis/osx/before_install.sh +++ b/travis/osx/before_install.sh @@ -8,6 +8,7 @@ brew update brew install ccache brew install sqlite3 brew install doxygen +brew install md5sha1sum export PATH=$HOME/Library/Python/2.7/bin:$PATH # breathe=4.12.0 is the last version to work for us with sphinx 1.8.5 / Python 2 |