Merge branch 'master' of github.com:zmap/zmap

2013-09-02 15:57:51 -04:00 · 2013-09-02 15:57:51 -04:00 · 3406f10271
parent b77100a387 7534966101
commit 3406f10271
1 changed files with 2 additions and 2 deletions
--- a/src/Makefile
+++ b/src/Makefile
@ -43,8 +43,8 @@ ifeq ($(REDIS), true)
 endif

 ifeq ($(JSON), true)
-	LDLIBS+=-L/usr/local/lib -ljson-c
-	CFLAGS+=-DJSON -I/usr/local/include/json-c
+	LDLIBS+=$(shell pkg-config --libs json-c)
+	CFLAGS+=-DJSON $(shell pkg-config --cflags json-c)
 	objects+=module_json.o
 endif