diff --git a/Makefile.am b/Makefile.am index fc79bc57..8188f9ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = lasso docs ABS_BUILDDIR = $(shell pwd) -EXTRA_DIST = TODO COPYING +EXTRA_DIST = TODO COPYING -pkgconfig_DATA = lasso.pc -pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = lasso.pc +pkgconfigdir = $(libdir)/pkgconfig diff --git a/configure.ac b/configure.ac index 6c54344a..5ec26b9d 100644 --- a/configure.ac +++ b/configure.ac @@ -360,7 +360,7 @@ AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed doc if test "z$with_html_dir" != "z" ; then LASSO_DOCDIR=$with_html_dir else - LASSO_DOCDIR='$(datadir)/doc/lasso1' + LASSO_DOCDIR='$(datadir)/doc/lasso' fi AC_MSG_RESULT($LASSO_DOCDIR) @@ -440,7 +440,6 @@ dnl ========================================================================== dnl Writing result files dnl ========================================================================== AC_OUTPUT([ -lasso.pc:lasso.pc.in lasso/version.h Makefile lasso/Makefile @@ -449,6 +448,7 @@ lasso/protocols/Makefile docs/Makefile docs/reference/Makefile ] +[lasso.pc:lasso.pc.in] dnl [lasso-config:lasso-config.in] dnl [lasso.spec:lasso.spec.in] ) diff --git a/lasso.pc.in b/lasso.pc.in index 16f2409e..569d2fed 100644 --- a/lasso.pc.in +++ b/lasso.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: lasso Version: @VERSION@ Description: A free implementation of the Liberty Alliance specifications -Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ xmlsec1 >= @XMLSEC1_MIN_VERSION@ +Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ xmlsec1 >= @XMLSEC1_MIN_VERSION@ glib-2.0 >= $GLIB_MIN_VERSION@ Cflags: @LASSO_CORE_CFLAGS@ Libs: -L${libdir} @LASSO_CORE_LIBS@