[glibmm/gmmproc-refactor] Fix include paths getter and setter in Gmmproc.

[Krzesimir Nowak <krnowak src gnome org>]

commit b35c36626580aeccb5b63e97c2b68f3ab7ef6de8
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Mon Jul 2 23:42:47 2012 +0200

    Fix include paths getter and setter in Gmmproc.

 Makefile.am                |   59 ++++++++++++++++++++++++++++++++++++++++++-
 Makefile.am.proper         |   58 -------------------------------------------
 tools/pm/Common/Gmmproc.pm |    6 ++--
 3 files changed, 60 insertions(+), 63 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 457ca0c..1a058b1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,58 @@
-ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
+## Copyright (c) 2009  Openismus GmbH  <http://www.openismus.com/>
+##
+## This file is part of glibmm.
+##
+## glibmm is free software: you can redistribute it and/or modify it
+## under the terms of the GNU Lesser General Public License as published
+## by the Free Software Foundation, either version 2.1 of the License,
+## or (at your option) any later version.
+##
+## glibmm is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+## See the GNU Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public License
+## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-SUBDIRS = tools
+ACLOCAL_AMFLAGS	= -I build ${ACLOCAL_FLAGS}
+DISTCHECK_CONFIGURE_FLAGS = --enable-warnings=fatal
+
+if MAINTAINER_MODE
+src_subdirs = glib/src gio/src
+else
+src_subdirs =
+endif
+if ENABLE_DOCUMENTATION
+doc_subdirs = docs
+else
+doc_subdirs =
+endif
+SUBDIRS = tools $(src_subdirs) glib/glibmm gio/giomm tests examples $(doc_subdirs)
+
+glibmm_includedir = $(includedir)/$(GLIBMM_MODULE_NAME)
+glibmm_include_HEADERS = glib/glibmm.h
+glibmm_libincludedir = $(libdir)/$(GLIBMM_MODULE_NAME)/include
+nodist_glibmm_libinclude_HEADERS = glib/glibmmconfig.h
+
+giomm_includedir = $(includedir)/$(GIOMM_MODULE_NAME)
+giomm_include_HEADERS = gio/giomm.h
+giomm_libincludedir = $(libdir)/$(GIOMM_MODULE_NAME)/include
+nodist_giomm_libinclude_HEADERS = gio/giommconfig.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+nodist_pkgconfig_DATA = glib/$(GLIBMM_MODULE_NAME).pc gio/$(GIOMM_MODULE_NAME).pc
+
+include $(srcdir)/MSVC_Net2005/filelist.am
+include $(srcdir)/MSVC_Net2008/filelist.am
+include $(srcdir)/MSVC_Net2010/filelist.am
+
+text_files = COPYING.tools README.SUN README.win32
+msvc_files = $(addprefix MSVC_Net2005/,$(msvc_net2005_data)) \
+             $(addprefix MSVC_Net2008/,$(msvc_net2008_data)) \
+             $(addprefix MSVC_Net2010/,$(msvc_net2010_data))
+
+dist_noinst_DATA = $(text_files) $(msvc_files)
+dist_noinst_SCRIPTS = autogen.sh
+
+DISTCLEANFILES = $(filter %mmconfig.h,$(msvc_files))
diff --git a/tools/pm/Common/Gmmproc.pm b/tools/pm/Common/Gmmproc.pm
index 691c3b9..5a58814 100644
--- a/tools/pm/Common/Gmmproc.pm
+++ b/tools/pm/Common/Gmmproc.pm
@@ -393,16 +393,16 @@ sub get_destination_dir ($)
 
 sub set_include_paths ($$)
 {
-  my ($self, $includes) = @_;
+  my ($self, $include_paths) = @_;
 
-  $self->{'includes'} = $includes;
+  $self->{'include_paths'} = $include_paths;
 }
 
 sub get_include_paths ($)
 {
   my ($self) = @_;
 
-  return $self->{'includes'};
+  return $self->{'include_paths'};
 }
 
 sub add_base ($$)