From 30dd367c0a2467dc292f653ea3afd6ad4c6e034b Mon Sep 17 00:00:00 2001
From: Keith Derrick <keith.derrick@palm.com>
Date: Fri, 30 Mar 2012 12:28:32 -0700
Subject: [PATCH] Modify install names for library and include files

Changing root name of library to json-c, and also the
directory where header files are installed to .../jsdon-c/*.

This avoids clashes with other implementations of JSON libraries.
---
 Makefile.am                | 10 +++++-----
 configure.in               |  2 +-
 json.pc.in => json-c.pc.in |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename json.pc.in => json-c.pc.in (67%)

diff --git a/Makefile.am b/Makefile.am
index 7f1abb13..eafaf6a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,12 +2,12 @@ AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
 
 EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj
 
-lib_LTLIBRARIES = libjson.la
+lib_LTLIBRARIES = libjson-c.la
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = json.pc
+pkgconfig_DATA = json-c.pc
 
-libjsonincludedir = $(includedir)/json
+libjsonincludedir = $(includedir)/json-c
 libjsoninclude_HEADERS = \
 	arraylist.h \
 	bits.h \
@@ -27,9 +27,9 @@ libjsoninclude_HEADERS = \
 #libjsonx_include_HEADERS = \
 #	json_config.h
 
-libjson_la_LDFLAGS = -version-info 1:0:1 -no-undefined
+libjson_c_la_LDFLAGS = -version-info 1:0:1 -no-undefined
 
-libjson_la_SOURCES = \
+libjson_c_la_SOURCES = \
 	arraylist.c \
 	debug.c \
 	json_object.c \
diff --git a/configure.in b/configure.in
index 49b31953..df0d82bd 100644
--- a/configure.in
+++ b/configure.in
@@ -31,5 +31,5 @@ AM_PROG_LIBTOOL
 
 AC_OUTPUT([
 Makefile
-json.pc
+json-c.pc
 ])
diff --git a/json.pc.in b/json-c.pc.in
similarity index 67%
rename from json.pc.in
rename to json-c.pc.in
index b3d140be..037739d2 100644
--- a/json.pc.in
+++ b/json-c.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: json
+Name: json-c
 Description: JSON implementation in C
 Version: @VERSION@
 Requires: 
-Libs:  -L${libdir} -ljson
-Cflags: -I${includedir}/json
+Libs:  -L${libdir} -ljson-c
+Cflags: -I${includedir}/json-c
-- 
2.47.2