use /usr/local/lib

Neeke · Jul 14, 2016 · 2c78879 · 2c78879
1 parent f1c853d
commit 2c78879
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 209 deletions.
diff --git a/config.m4 b/config.m4
@@ -58,7 +58,7 @@ if test "$PHP_JSONNET" != "no"; then
   cd ../
 
   # --with-jsonnet -> check with-path
-  SEARCH_PATH="/usr/local/libjsonnet"
+  SEARCH_PATH="/usr/local/lib"
   SEARCH_FOR="libjsonnet.h"
   if test -r $PHP_JSONNET/$SEARCH_FOR; then # path given as parameter
     JSONNET_DIR=$PHP_JSONNET

diff --git a/libjsonnet/Makefile b/libjsonnet/Makefile
@@ -83,7 +83,7 @@ ALL_HEADERS = \
 	include/libjsonnet.h \
 	include/libjsonnet++.h
 
-LIB_JSONNET_PATH = /usr/local/libjsonnet
+LIB_JSONNET_PATH = /usr/local/lib
 
 default: jsonnet
 
@@ -121,6 +121,7 @@ jsonnet: cmd/jsonnet.cpp $(LIB_OBJ)
 libjsonnet.so: $(LIB_OBJ)
 	$(CXX) $(LDFLAGS) $(LIB_OBJ) $(SHARED_LDFLAGS) -o $@
 	mkdir -p $(LIB_JSONNET_PATH)
+	mkdir -p $(LIB_JSONNET_PATH)
 	cp -rf include/libjsonnet.h  $(LIB_JSONNET_PATH)
 	cp -rf libjsonnet.so $(LIB_JSONNET_PATH)
 

diff --git a/libjsonnet/cpp/libjsonnet++_test.cpp b/libjsonnet/cpp/libjsonnet++_test.cpp
diff --git a/libjsonnet/cpp/testdata/BUILD b/libjsonnet/cpp/testdata/BUILD
diff --git a/libjsonnet/cpp/testdata/example.jsonnet b/libjsonnet/cpp/testdata/example.jsonnet
diff --git a/libjsonnet/cpp/testdata/example_golden.json b/libjsonnet/cpp/testdata/example_golden.json
diff --git a/libjsonnet/cpp/testdata/importing.jsonnet b/libjsonnet/cpp/testdata/importing.jsonnet
diff --git a/libjsonnet/cpp/testdata/importing_golden.json b/libjsonnet/cpp/testdata/importing_golden.json
diff --git a/libjsonnet/cpp/testdata/invalid.jsonnet b/libjsonnet/cpp/testdata/invalid.jsonnet