diff -ur globus_gram_protocol-7.4.orig/pkgdata/MyFilelists.pm globus_gram_protocol-7.4/pkgdata/MyFilelists.pm
--- globus_gram_protocol-7.4.orig/pkgdata/MyFilelists.pm	2002-08-08 22:58:36.000000000 +0200
+++ globus_gram_protocol-7.4/pkgdata/MyFilelists.pm	2009-08-05 08:17:05.333218834 +0200
@@ -20,13 +20,19 @@
 sub rtl_files {
   my $self = shift;
   my $result = [];
-  $self->{'filelist'}->flavored_files();
+  $self->{'filelist'}->flavored_files() if defined $self->{'mangling'};
   $self->{'filelist'}->extract_dynamic_libs();
   $self->{'filelist'}->add_package_metadata_files('rtl');
   my $list = $self->{'filelist'}->get_list();
   push @$result, @$list;
   $self->{'filelist'}->reset();
 
+  $self->{'filelist'}->flavored_files() if defined $self->{'mangling'};
+  $self->{'filelist'}->extract_libtool_libs();
+  $list = $self->{'filelist'}->get_list();
+  push @$result, @$list;
+  $self->{'filelist'}->reset();
+
   return $result;
 }
 
@@ -34,15 +40,19 @@
 sub data_files {
   my $self = shift;
   my $result = [];
+
   $self->{'filelist'}->extract_perl_modules();
   $self->{'filelist'}->add_package_metadata_files('data', 'noflavor');
-
   my $list = $self->{'filelist'}->get_list();
   push @$result, @$list;
   $self->{'filelist'}->reset();
 
-  return $result;
+  $self->{'filelist'}->extract_data();
+  $list = $self->{'filelist'}->get_list();
+  push @$result, @$list;
+  $self->{'filelist'}->reset();
 
+  return $result;
 }
 
 1;
diff -ur globus_gram_protocol-7.4.orig/scripts/Makefile.am globus_gram_protocol-7.4/scripts/Makefile.am
--- globus_gram_protocol-7.4.orig/scripts/Makefile.am	2002-08-08 22:58:37.000000000 +0200
+++ globus_gram_protocol-7.4/scripts/Makefile.am	2009-08-05 08:16:26.585305779 +0200
@@ -1,11 +1,11 @@
 include $(top_srcdir)/globus_automake_pre
 
 # Extra directories into which we install files
-globusperldir=$(GLOBUS_LOCATION)/lib/perl/Globus/GRAM
-perldocdir=$(GLOBUS_LOCATION)/share/doc/perl/Globus/GRAM
+globusperldir=$(perlmoduledir)/Globus/GRAM
+perldocdir=$(docdir)/$(PACKAGE)/perl/Globus/GRAM
 
 # Not handled by automake, because of :: in the destination file names
-MAN_DIR=$(GLOBUS_LOCATION)/man/man3
+MAN_DIR=$(mandir)/man3
 
 # What gets installed where
 globusperl_DATA = Error.pm JobSignal.pm JobState.pm
@@ -39,7 +39,7 @@
 # The default filelist-noinstDATA rule will list each of the man pages
 # in the filelist in the root directory. This added dependency will add those
 # files in the correct place as well.
-filelist-noinstDATA: filelist-man
+filelist: filelist-man
 
 filelist-man:
 	@list='$(noinst_DATA)'; for p in $$list; do \