Prepend tools/pm/ to Perl include path

* g{lib,io}/src/Makefile.am (gmmproc): Pass -I$(top_srcdir)/tools/pm
to the Perl interpreter when invoking the local gmmproc, so that it
will pick up the modules from the source tree instead of an existing
glibmm installation.
* tools/gmmproc.in (BEGIN): Substitute @GLIBMM_MODULE_NAME@ instead
of hard-coding the location.

1 files changed, 9 insertions, 17 deletions

diff --git a/tools/gmmproc.in b/tools/gmmproc.in
index 8c05acbd..d33e25b0 100644
--- a/tools/gmmproc.in
+++ b/tools/gmmproc.in
@@ -43,12 +43,11 @@ BEGIN {
   my $exec_prefix = "@exec_prefix@";
   my $libdir = "@libdir@";
 
-  # This line must match the install directory in m4/Makefile.am
-  $main::procdir = "$libdir/glibmm-2.4/proc";
+  # This line must match the install directory
+  $main::procdir = $libdir . '/@GLIBMM_MODULE_NAME@/proc';
   $main::m4path = "@M4@";
 
-  # This line must match install dir from pm/Makefile.am
-  push @INC,"$main::procdir/pm";
+  push(@INC, $main::procdir . '/pm');
 }
 
 use strict;
@@ -59,21 +58,15 @@ use WrapParser;
 
 # initialize globals 
 @main::macrodirs = ();
-$main::srcdir = ".";
-$main::defsdir = ".";
-$main::source = "";
-$main::debug = 0;
+$main::srcdir    = '.';
+$main::defsdir   = '.';
+$main::source    = '';
 $main::unwrapped = 1;
-
-{ # checking the environment for a set variable can trigger a warning
-  no warnings;
-  $main::debug = 1 if ($ENV{'GMMPROC_DEBUG'} eq 1);
-}
+$main::debug     = (exists $ENV{'GMMPROC_DEBUG'}) ? $ENV{'GMMPROC_DEBUG'} : '';
 
 # prototypes
 sub parse_command_line_args();
 
-
 #main()
 parse_command_line_args();
 
@@ -227,13 +220,12 @@ sub parse_command_line_args()
 
   if ($#ARGV != 1)
   {
-    print STDERR "Invalid number of arguments (", $#ARGV+2, ")\n";
+    print STDERR ('Invalid number of arguments (', $#ARGV + 2, ")\n");
     print_usage();
   }
 
   $main::srcdir = $ARGV[0];
   $main::source = $_;
 
-  push @main::macrodirs,"$main::procdir/m4";
+  push @main::macrodirs, $main::procdir . '/m4';
 }
-