[anjuta/gnome-2-26] #584180 – Duplicate copy of GBF/General.pm installed to same location

[Daniel Elstner <daniel src gnome org>]

commit 9fda9dcc4c64afad6f2176a8da14255d50dfcef8
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Sat Jun 20 22:13:21 2009 +0200

    #584180 â?? Duplicate copy of GBF/General.pm installed to same location
    
    * plugins/gbf-am/GBF/General.pm: Remove file, as it is already
    included with the gbf-mkfile plugin.
    * plugins/gbf-am/GBF/Makefile.am (perlmodules_DATA): Remove
    General.pm from the list of files to install.  Add dist_ prefix
    and get rid of EXTRA_DIST while we are at it.
    * plugins/gbf-mkfile/GBF/Makefile.am (perlmodules_DATA): Add dist_
    prefix here, too.

 plugins/gbf-am/GBF/General.pm      |  119 ------------------------------------
 plugins/gbf-am/GBF/Makefile.am     |    5 +-
 plugins/gbf-mkfile/GBF/General.pm  |    7 +-
 plugins/gbf-mkfile/GBF/Makefile.am |    5 +-
 4 files changed, 7 insertions(+), 129 deletions(-)
---
diff --git a/plugins/gbf-am/GBF/Makefile.am b/plugins/gbf-am/GBF/Makefile.am
index 4d3bf2b..6707d72 100644
--- a/plugins/gbf-am/GBF/Makefile.am
+++ b/plugins/gbf-am/GBF/Makefile.am
@@ -1,5 +1,4 @@
 perlmodulesdir = $(pkgdatadir)/GBF
-perlmodules_DATA = AmFiles.pm General.pm
-
-EXTRA_DIST = $(perlmodules_DATA)
+# Use General.pm from gbf-mkfile plugin
+dist_perlmodules_DATA = AmFiles.pm 
 
diff --git a/plugins/gbf-mkfile/GBF/General.pm b/plugins/gbf-mkfile/GBF/General.pm
index 2cd0019..a573595 100644
--- a/plugins/gbf-mkfile/GBF/General.pm
+++ b/plugins/gbf-mkfile/GBF/General.pm
@@ -37,11 +37,10 @@ sub report_warning
 
 sub canonicalize_name
 {
-    my ($name);
+    my ($name) = @_;
+
+    $name =~ s'[^0-9 A-Z_a-z]'_'g;
 
-    $name = $_[0];
-    $name =~ tr/\.-/_/;
-    
     return $name;
 }
 
diff --git a/plugins/gbf-mkfile/GBF/Makefile.am b/plugins/gbf-mkfile/GBF/Makefile.am
index 471391a..a268c0a 100644
--- a/plugins/gbf-mkfile/GBF/Makefile.am
+++ b/plugins/gbf-mkfile/GBF/Makefile.am
@@ -1,5 +1,4 @@
 perlmodulesdir = $(pkgdatadir)/GBF
-perlmodules_DATA = Make.pm General.pm
-
-EXTRA_DIST = $(perlmodules_DATA)
+# General.pm is used by gbf-am plugin too
+dist_perlmodules_DATA = Make.pm General.pm