summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorYann Collet <cyan@fb.com>2020-08-27 06:20:28 (GMT)
committerYann Collet <cyan@fb.com>2020-08-27 06:20:28 (GMT)
commit3e3a006c6f3337be4298e2c01ba3cb2c0ba04d45 (patch)
tree402305c0d06ccad0faec793b0889010bf3ae9fce /Makefile
parentf18dbeb8b54917cbc7a2417413c84604ee0b81f5 (diff)
parentb73cd37baba01229fb67a7aaae9e95fcffd09059 (diff)
downloadlz4-3e3a006c6f3337be4298e2c01ba3cb2c0ba04d45.zip
lz4-3e3a006c6f3337be4298e2c01ba3cb2c0ba04d45.tar.gz
lz4-3e3a006c6f3337be4298e2c01ba3cb2c0ba04d45.tar.bz2
Merge branch 'dev' into extraInput
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f25f951..ab695ea 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ travis-install:
$(MAKE) -j1 install DESTDIR=~/install_test_dir
cmake:
- @cd contrib/cmake_unofficial; cmake $(CMAKE_PARAMS) CMakeLists.txt; $(MAKE)
+ @cd build/cmake; cmake $(CMAKE_PARAMS) CMakeLists.txt; $(MAKE)
endif