Backward compatible XPATH via symbols, not macros

util/Makefile.in

@@ -61,7 +61,7 @@ LIBS    	= @LIBS@
 
 CPPFLAGS  	= @CPPFLAGS@
 
-INCLUDES = -I. @INCLUDES@ -I$(top_srcdir)/lib/clixon -I$(top_srcdir)/include -I$(top_srcdir)
+INCLUDES = -I. @INCLUDES@ -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)
 
 MYLIB        = ../lib/src/libclixon$(SH_SUFFIX).$(CLIXON_MAJOR).$(CLIXON_MINOR)
 

util/clixon_util_json.c

@@ -56,7 +56,7 @@
 #include <cligen/cligen.h>
 
 /* clixon */
-#include <clixon/clixon.h>
+#include "clixon/clixon.h"
 
 /*
  * Turn this on to get a json parse and pretty print test program

util/clixon_util_xml.c

@@ -54,7 +54,7 @@
 #include <cligen/cligen.h>
 
 /* clixon */
-#include <clixon/clixon.h>
+#include "clixon/clixon.h"
 
 /*
  * Turn this on to get a xml parse and pretty print test program

util/clixon_util_xpath.c

@@ -62,7 +62,7 @@ echo "a\n<a><b/></a>" | xpath
 #include <cligen/cligen.h>
 
 /* clixon */
-#include <clixon/clixon.h>
+#include "clixon/clixon.h"
 
 static int
 usage(char *argv0)

util/clixon_util_yang.c

@@ -58,7 +58,7 @@
 #include <cligen/cligen.h>
 
 /* clixon */
-#include <clixon/clixon.h>
+#include "clixon/clixon.h"
 
 /*
 */