Skip to content

Commit

Permalink
Re-add the "json" pkg-config file as a compatibility shim.
Browse files Browse the repository at this point in the history
Also rename the json-c-uninstalled.pc file.
  • Loading branch information
hawicz committed Jul 29, 2012
1 parent 9f16e25 commit 1f9d199
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Expand Up @@ -11,8 +11,9 @@
/configure
/depcomp
/install-sh
/json.pc
/json-c.pc
/json-uninstalled.pc
/json-c-uninstalled.pc
/libtool
/ltmain.sh
/Makefile
Expand Down
3 changes: 3 additions & 0 deletions Makefile.am
Expand Up @@ -10,6 +10,9 @@ endif

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = json-c.pc
if ENABLE_OLDNAME_COMPAT
pkgconfig_DATA += json.pc
endif

libjson_cincludedir = $(includedir)/json-c
libjson_cinclude_HEADERS = \
Expand Down
3 changes: 2 additions & 1 deletion configure.in
Expand Up @@ -41,9 +41,10 @@ AM_PROG_LIBTOOL

AC_CONFIG_FILES([
Makefile
json.pc
json-c.pc
tests/Makefile
json-uninstalled.pc
json-c-uninstalled.pc
])

AC_OUTPUT
Expand Down
File renamed without changes.
11 changes: 11 additions & 0 deletions json.pc.in
@@ -0,0 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: json-c
Description: JSON implementation in C, compat shim. Use json-c instead.
Version: @VERSION@
Requires: json-c
Libs:
Cflags:

0 comments on commit 1f9d199

Please sign in to comment.