From: Petri Lehtinen <petri@digip.org>
Date: Sun, 17 Jan 2010 11:57:20 +0000 (+0200)
Subject: Merge branch '1.1'
X-Git-Tag: v1.2~5
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=f9febb64c5dc15e03ecf3ca552e0654ee919b52e

Merge branch '1.1'

Conflicts:
	Makefile.am
---

f9febb64c5dc15e03ecf3ca552e0654ee919b52e
diff --cc Makefile.am
index 185eaab,2a69f16..a141cd5
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,4 -1,10 +1,7 @@@
  EXTRA_DIST = CHANGES LICENSE README.rst
  SUBDIRS = doc src test
  
 +check-local: html
++
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = jansson.pc
 -
 -distcheck-hook:
 -	sphinx-build -b html -W \
 -		$(distdir)/doc \
 -		$(distdir)/_build/doc/.build/html