Build: Generate mm-common-util-uninstalled.pc

* mm-common-util-uninstalled.pc.in: For consistency, create
a pkg-config file for uninstalled use of the mm-common utilities.

6 files changed, 23 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index 2e74ae4..db9735e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,4 @@
 /macros/mm-common.m4
 /util/mm-common-prepare
 /util/mm-common-prepare.1
-/util/mm-common-util.pc
+/util/mm-common*.pc
diff --git a/Makefile.am b/Makefile.am
index d744d5f..4430391 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,8 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
 bin_SCRIPTS = util/mm-common-prepare
 man1_MANS = util/mm-common-prepare.1
 
-# These are installed so that mm-common-prepare can copy them into projects at autogen.sh time:
+# These are installed so that mm-common-prepare can copy them
+# into projects at autogen.sh time:
 build_supportdir = $(pkgdatadir)/build
 dist_build_support_DATA =		\
 	build/compile-binding.am	\
@@ -29,19 +30,20 @@ dist_build_support_DATA =		\
 	build/doc-reference.am		\
 	build/generate-binding.am
 
-# These are installed so that aclocal can copy them into aclocal.m4 at autogen.sh time:
+# These are installed so that aclocal can copy them into aclocal.m4
+# at autogen.sh time:
 aclocal_macrodir = $(datadir)/aclocal
 aclocal_macro_DATA = macros/mm-common.m4
 dist_aclocal_macro_DATA =		\
-	macros/mm-ax_cxx_compile_stdcxx_11.m4		\
+	macros/mm-ax_cxx_compile_stdcxx_11.m4	\
 	macros/mm-dietlib.m4		\
 	macros/mm-doc.m4		\
 	macros/mm-module.m4		\
 	macros/mm-pkg.m4		\
 	macros/mm-warnings.m4
 
-# These are installed so that mm-common-prepare can copy them into projects at autogen.sh time,
-# if a directory path is given to MM_CONFIG_DOCTOOL_DIR(),
+# These are installed so that mm-common-prepare can copy them into projects
+# at autogen.sh time if a directory path is given to MM_CONFIG_DOCTOOL_DIR(),
 # or they can be found via pkg-config --variable=doctooldir mm-common,
 # which is preferrable.
 doctooldir = $(pkgdatadir)/doctool
@@ -60,7 +62,10 @@ shared_pkgconfigdir = $(datadir)/pkgconfig
 nodist_shared_pkgconfig_DATA =		\
 	doctags/mm-common-libstdc++.pc	\
 	util/mm-common-util.pc
-noinst_DATA = doctags/mm-common-libstdc++-uninstalled.pc
+
+noinst_DATA = \
+	doctags/mm-common-libstdc++-uninstalled.pc \
+	util/mm-common-util-uninstalled.pc
 
 dist_doc_DATA = README
 doc_DATA = skeletonmm.tar.gz
diff --git a/configure.ac b/configure.ac
index 94c7603..6f04c7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,5 +55,6 @@ AC_CONFIG_FILES([
   macros/mm-common.m4
   util/mm-common-prepare
   util/mm-common-util.pc
+  util/mm-common-util-uninstalled.pc
 ])
 AC_OUTPUT
diff --git a/doctags/mm-common-libstdc++-uninstalled.pc.in b/doctags/mm-common-libstdc++-uninstalled.pc.in
index 0b8ff49..c30015b 100644
--- a/doctags/mm-common-libstdc++-uninstalled.pc.in
+++ b/doctags/mm-common-libstdc++-uninstalled.pc.in
@@ -2,6 +2,6 @@ doxytagfile=${pc_top_builddir}/doctags/libstdc++.tag
 htmlrefpub=http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/
 
 Name: mm-common-libstdc++
-Description: GNU libstdc++ metadata module, not installed
+Description: mm-common's libstdc++ metadata module, not installed
 Version: @PACKAGE_VERSION@
 URL: http://www.gtkmm.org/
diff --git a/util/mm-common-util-uninstalled.pc.in b/util/mm-common-util-uninstalled.pc.in
new file mode 100644
index 0000000..655e98f
--- /dev/null
+++ b/util/mm-common-util-uninstalled.pc.in
@@ -0,0 +1,6 @@
+doctooldir=${pc_top_builddir}/util
+
+Name: mm-common-util
+Description: mm-common's doctool build utilities for the GNOME C++ bindings, not installed
+Version: @PACKAGE_VERSION@
+URL: http://www.gtkmm.org/
diff --git a/util/mm-common-util.pc.in b/util/mm-common-util.pc.in
index 844d134..d0553f4 100644
--- a/util/mm-common-util.pc.in
+++ b/util/mm-common-util.pc.in
@@ -1,10 +1,10 @@
 prefix=@prefix@
 datarootdir=@datarootdir@
 datadir=@datadir@
-
-doctooldir=${datadir}/mm-common/doctool
+pkgdatadir=${datadir}/@PACKAGE_TARNAME@
+doctooldir=${pkgdatadir}/doctool
 
 Name: mm-common-util
-Description: mm-common's doctool build utilities for the GNOME C++ bindings.
+Description: mm-common's doctool build utilities for the GNOME C++ bindings
 Version: @PACKAGE_VERSION@
 URL: http://www.gtkmm.org/