glibmm r601 - in trunk: . glib tools tools/m4 tools/pm

[jjongsma svn gnome org]

Author: jjongsma
Date: Sat Feb 16 03:33:33 2008
New Revision: 601
URL: http://svn.gnome.org/viewvc/glibmm?rev=601&view=rev

Log:
	* configure.in: add a GMMPROC_DIR variable so the individual
	Makefile.am files don't need to duplicate the information about where
	gmmproc is to be installed
	* glib/glibmm-2.4.pc.in: add new gmmprocdir variable so that interested
	libraries can query it with `pkg-config --variable gmmprocdir glibmm-2.4`
	* tools/Makefile.am:
	* tools/m4/Makefile.am:
	* tools/pm/Makefile.am: use the new GMMPROC_DIR variable



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/glib/glibmm-2.4.pc.in
   trunk/tools/Makefile.am
   trunk/tools/m4/Makefile.am
   trunk/tools/pm/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Feb 16 03:33:33 2008
@@ -152,6 +152,9 @@
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
 
+#location to install gmmproc tools
+GMMPROC_DIR=[${libdir}/glibmm-2.4/proc]
+AC_SUBST([GMMPROC_DIR])
 
 #########################################################################
 #  C++ checks

Modified: trunk/glib/glibmm-2.4.pc.in
==============================================================================
--- trunk/glib/glibmm-2.4.pc.in	(original)
+++ trunk/glib/glibmm-2.4.pc.in	Sat Feb 16 03:33:33 2008
@@ -2,6 +2,7 @@
 exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
+gmmprocdir= GMMPROC_DIR@
 
 Name: GLibmm
 Description: C++ wrapper for GLib

Modified: trunk/tools/Makefile.am
==============================================================================
--- trunk/tools/Makefile.am	(original)
+++ trunk/tools/Makefile.am	Sat Feb 16 03:33:33 2008
@@ -6,6 +6,6 @@
 EXTRA_DIST = Makefile_list_of_sources.am_fragment $(files_tools_perl) README TODO enum.pl
 
 gmmproc_bin_SCRIPTS = gmmproc $(files_tools_genwrap)
-gmmproc_bindir = $(libdir)/glibmm-2.4/proc
+gmmproc_bindir = $(GMMPROC_DIR)
 
 

Modified: trunk/tools/m4/Makefile.am
==============================================================================
--- trunk/tools/m4/Makefile.am	(original)
+++ trunk/tools/m4/Makefile.am	Sat Feb 16 03:33:33 2008
@@ -5,6 +5,6 @@
 
 # Install the .m4, files:
 
-tools_m4_includedir = $(libdir)/glibmm-2.4/proc/m4
+tools_m4_includedir = $(GMMPROC_DIR)/m4
 tools_m4_include_HEADERS = $(files_tools_m4)
 

Modified: trunk/tools/pm/Makefile.am
==============================================================================
--- trunk/tools/pm/Makefile.am	(original)
+++ trunk/tools/pm/Makefile.am	Sat Feb 16 03:33:33 2008
@@ -5,6 +5,6 @@
 
 # Install the .pm, files:
 
-tools_pm_includedir = $(libdir)/glibmm-2.4/proc/pm
+tools_pm_includedir = $(GMMPROC_DIR)/pm
 tools_pm_include_HEADERS = $(files_tools_pm)