Merge branch '1.2'

[jansson.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b4b5bc3..a141cd5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,7 @@
-SUBDIRS = src test
+EXTRA_DIST = CHANGES LICENSE README.rst
+SUBDIRS = doc src test
+
+check-local: html
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = jansson.pc