diff -ur gpt.orig/packaging_tools/amdir/pkgdata_Makefile.am gpt/packaging_tools/amdir/pkgdata_Makefile.am
--- gpt.orig/packaging_tools/amdir/pkgdata_Makefile.am	2006-07-26 21:16:59.000000000 +0200
+++ gpt/packaging_tools/amdir/pkgdata_Makefile.am	2008-12-15 08:33:05.000000000 +0100
@@ -1,6 +1,6 @@
 include $(top_srcdir)/globus_automake_pre
 
-flavordir = $(GLOBUS_LOCATION)/etc/$(PACKAGE)
+flavordir = $(datadir)/globus/flavors
 
 FILELIST_FILES = noflavor_data.filelist \
 	$(GLOBUS_FLAVOR_NAME)_dev.filelist \
diff -ur gpt.orig/packaging_tools/configure gpt/packaging_tools/configure
--- gpt.orig/packaging_tools/configure	2008-12-15 08:32:40.000000000 +0100
+++ gpt/packaging_tools/configure	2008-12-15 08:33:05.000000000 +0100
@@ -273,7 +273,7 @@
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="Makefile.am"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot PERL POD2MAN perlmoduledir TAR GUNZIP GZIP LN_S GPT_LOCATION LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot PERL POD2MAN perlmoduledir TAR GUNZIP GZIP LN_S GPT_LOCATION ENABLE_COMPAT_TRUE ENABLE_COMPAT_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -793,6 +793,11 @@
    esac
   cat <<\_ACEOF
 
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-compat        disable backward compatibility symlinks
+
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
@@ -2033,6 +2038,26 @@
 
 
 
+# Check whether --enable-compat was given.
+if test "${enable_compat+set}" = set; then
+  enableval=$enable_compat;
+else
+  enable_compat="yes"
+fi
+
+{ echo "$as_me:$LINENO: Enable backward compatibility symlinks: $enable_compat" >&5
+echo "$as_me: Enable backward compatibility symlinks: $enable_compat" >&6;}
+
+
+if test "x$enable_compat" = "xyes"; then
+  ENABLE_COMPAT_TRUE=
+  ENABLE_COMPAT_FALSE='#'
+else
+  ENABLE_COMPAT_TRUE='#'
+  ENABLE_COMPAT_FALSE=
+fi
+
+
                               ac_config_files="$ac_config_files Makefile perl/scripts/gpt_version perl/GPT/GPTIdentity.pm"
 
 cat >confcache <<\_ACEOF
@@ -2157,6 +2182,13 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
+if test -z "${ENABLE_COMPAT_TRUE}" && test -z "${ENABLE_COMPAT_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"ENABLE_COMPAT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"ENABLE_COMPAT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -2711,6 +2743,8 @@
 s,@GZIP@,$GZIP,;t t
 s,@LN_S@,$LN_S,;t t
 s,@GPT_LOCATION@,$GPT_LOCATION,;t t
+s,@ENABLE_COMPAT_TRUE@,$ENABLE_COMPAT_TRUE,;t t
+s,@ENABLE_COMPAT_FALSE@,$ENABLE_COMPAT_FALSE,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
diff -ur gpt.orig/packaging_tools/configure.ac gpt/packaging_tools/configure.ac
--- gpt.orig/packaging_tools/configure.ac	2008-12-15 08:32:40.000000000 +0100
+++ gpt/packaging_tools/configure.ac	2008-12-15 08:33:05.000000000 +0100
@@ -85,6 +85,10 @@
 
 AC_SUBST(GPT_LOCATION)
 
+AC_ARG_ENABLE(compat, AC_HELP_STRING([--disable-compat], [disable backward compatibility symlinks]),[],enable_compat="yes")
+AC_MSG_NOTICE([Enable backward compatibility symlinks: $enable_compat])
+AM_CONDITIONAL([ENABLE_COMPAT],[test "x$enable_compat" = "xyes"])
+
 AC_CONFIG_FILES(Makefile 
         perl/scripts/gpt_version
         perl/GPT/GPTIdentity.pm
diff -ur gpt.orig/packaging_tools/etc/gpt-bootstrap.sh gpt/packaging_tools/etc/gpt-bootstrap.sh
--- gpt.orig/packaging_tools/etc/gpt-bootstrap.sh	2008-01-25 21:33:21.000000000 +0100
+++ gpt/packaging_tools/etc/gpt-bootstrap.sh	2008-12-15 08:43:01.000000000 +0100
@@ -9,7 +9,7 @@
 # Removed check for autotools.  CAB 01/08
 
 # Always include globus macros
-config="$aclocal_includes -I $GLOBUS_LOCATION/share/globus_aclocal"
+config="$aclocal_includes -I $GLOBUS_LOCATION/share/globus/aclocal"
 
 # test for local macros
 if test -d "./config"; then
@@ -17,13 +17,13 @@
 fi
 
 # test to see if GPT macros are in a seperate location
-if test ! -f "$GLOBUS_LOCATION/share/globus_aclocal/gpt_autoconf_macros.m4"; then
+if test ! -f "$GLOBUS_LOCATION/share/globus/aclocal/gpt_autoconf_macros.m4"; then
     if test "x$GPT_LOCATION" = "x"; then
         echo "ERROR Globus Packaging Tools not found" >&2
         echo "ERROR either set GPT_LOCATION or install them in $GLOBUS_LOCATION" >&2
         exit 1
     else
-        config="$config -I $GPT_LOCATION/share/gpt/aclocal"
+        config="$config -I $GPT_LOCATION/share/globus/aclocal"
     fi
 fi
 
@@ -33,7 +33,7 @@
 
 if test ! -h pkgdata/Makefile.am ; then
     echo "installing Makefile.am in the pkgdata directory"
-    ln -s $GPT_LOCATION/share/gpt/amdir/pkgdata_Makefile.am \
+    ln -s $GPT_LOCATION/share/globus/amdir/pkgdata_Makefile.am \
     pkgdata/Makefile.am
 fi
 
diff -ur gpt.orig/packaging_tools/etc/gpt_rpm.spec gpt/packaging_tools/etc/gpt_rpm.spec
--- gpt.orig/packaging_tools/etc/gpt_rpm.spec	2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/etc/gpt_rpm.spec	2008-12-15 08:33:05.000000000 +0100
@@ -31,7 +31,7 @@
 %build
 GPT_INSTALL_LOCATION=${RPM_BUILD_ROOT}GPT_PREFIX_GPT; export GPT_INSTALL_LOCATION; $GPT_LOCATION/sbin/gpt-install --force ${RPM_SOURCE_DIR}/GPT_BIN_PKG_NAME_GPT
 
-rm -f ${RPM_BUILD_ROOT}GPT_PREFIX_GPT/etc/gpt/packages/GPT_NAME_GPT/GPT_FLAVOR_GPTGPT_PKGTYPE_GPT.format
+rm -f ${RPM_BUILD_ROOT}GPT_PREFIX_GPT/share/globus/packages/GPT_NAME_GPT/GPT_FLAVOR_GPTGPT_PKGTYPE_GPT.format
 
 
 #########################################################################
diff -ur gpt.orig/packaging_tools/Makefile.am gpt/packaging_tools/Makefile.am
--- gpt.orig/packaging_tools/Makefile.am	2008-12-15 08:32:40.000000000 +0100
+++ gpt/packaging_tools/Makefile.am	2008-12-15 08:38:27.000000000 +0100
@@ -31,11 +31,11 @@
 	perl/scripts/gpt_version
 
 
-gptdatadir = ${prefix}/etc/gpt
+gptdatadir = $(datadir)/globus
 
 gptdata_DATA = gpt_scripts_list
 
-gptexecsharedir = ${prefix}/share/gpt
+gptexecsharedir = $(datadir)/globus
 
 gptexecshare_SCRIPTS = config.guess
 
@@ -128,7 +128,7 @@
 	perl/GPT/PackageFilelist/xml1/ListInterface.pm
 
 
-amdirdir = $(datadir)/gpt/amdir
+amdirdir = $(datadir)/globus/amdir
 
 amdir_DATA = \
 	amdir/data.am \
@@ -143,9 +143,9 @@
 	amdir/pkgdata_Makefile.am
 
 
-pkg_confdir = $(sysconfdir)/gpt
-dtddir = $(sysconfdir)/gpt/dtd
-aclocaldir = $(datadir)/gpt/aclocal
+pkg_confdir = $(datadir)/globus
+dtddir = $(datadir)/globus/dtd
+aclocaldir = $(datadir)/globus/aclocal
 
 pkg_conf_DATA = \
 	etc/globus_flavor_labels.conf \
@@ -171,7 +171,11 @@
 	etc/gpt-bootstrap.sh
 
 install-man: install-pod2man
+if ENABLE_COMPAT
 install-data-hook: install-localize hack-for-globus-core
+else
+install-data-hook: install-localize
+endif
 
 install-localize:
 	@echo "Localizing scripts to $(PERL)"
@@ -197,13 +201,13 @@
 	@if test ! -h $(datadir)/globus_aclocal; then \
 		startdir=`pwd`; \
 		cd $(datadir); \
-		$(LN_S) gpt/aclocal globus_aclocal; \
+		$(LN_S) globus/aclocal globus_aclocal; \
 		cd $$startdir; \
 	fi; \
 	if test ! -h $(datadir)/gpt_amdir; then \
 		startdir=`pwd`; \
 		cd $(datadir); \
-		$(LN_S) gpt/amdir gpt_amdir; \
+		$(LN_S) globus/amdir gpt_amdir; \
 		cd $$startdir; \
 	fi
 
diff -ur gpt.orig/packaging_tools/Makefile.in gpt/packaging_tools/Makefile.in
--- gpt.orig/packaging_tools/Makefile.in	2008-12-15 08:32:40.000000000 +0100
+++ gpt/packaging_tools/Makefile.in	2008-12-15 08:37:36.000000000 +0100
@@ -49,6 +49,8 @@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+ENABLE_COMPAT_FALSE = @ENABLE_COMPAT_FALSE@
+ENABLE_COMPAT_TRUE = @ENABLE_COMPAT_TRUE@
 GPT_LOCATION = @GPT_LOCATION@
 GUNZIP = @GUNZIP@
 GZIP = @GZIP@
@@ -141,11 +143,11 @@
 	perl/scripts/gpt_version
 
 
-gptdatadir = ${prefix}/etc/gpt
+gptdatadir = $(datadir)/globus
 
 gptdata_DATA = gpt_scripts_list
 
-gptexecsharedir = ${prefix}/share/gpt
+gptexecsharedir = $(datadir)/globus
 
 gptexecshare_SCRIPTS = config.guess
 
@@ -241,7 +243,7 @@
 	perl/GPT/PackageFilelist/xml1/ListInterface.pm
 
 
-amdirdir = $(datadir)/gpt/amdir
+amdirdir = $(datadir)/globus/amdir
 
 amdir_DATA = \
 	amdir/data.am \
@@ -256,9 +258,9 @@
 	amdir/pkgdata_Makefile.am
 
 
-pkg_confdir = $(sysconfdir)/gpt
-dtddir = $(sysconfdir)/gpt/dtd
-aclocaldir = $(datadir)/gpt/aclocal
+pkg_confdir = $(datadir)/globus
+dtddir = $(datadir)/globus/dtd
+aclocaldir = $(datadir)/globus/aclocal
 
 pkg_conf_DATA = \
 	etc/globus_flavor_labels.conf \
@@ -837,7 +839,8 @@
 
 
 install-man: install-pod2man
-install-data-hook: install-localize hack-for-globus-core
+@ENABLE_COMPAT_TRUE@install-data-hook: install-localize hack-for-globus-core
+@ENABLE_COMPAT_FALSE@install-data-hook: install-localize
 
 install-localize:
 	@echo "Localizing scripts to $(PERL)"
@@ -863,13 +866,13 @@
 	@if test ! -h $(datadir)/globus_aclocal; then \
 		startdir=`pwd`; \
 		cd $(datadir); \
-		$(LN_S) gpt/aclocal globus_aclocal; \
+		$(LN_S) globus/aclocal globus_aclocal; \
 		cd $$startdir; \
 	fi; \
 	if test ! -h $(datadir)/gpt_amdir; then \
 		startdir=`pwd`; \
 		cd $(datadir); \
-		$(LN_S) gpt/amdir gpt_amdir; \
+		$(LN_S) globus/amdir gpt_amdir; \
 		cd $$startdir; \
 	fi
 
diff -ur gpt.orig/packaging_tools/perl/GPT/Algorithms.pm gpt/packaging_tools/perl/GPT/Algorithms.pm
--- gpt.orig/packaging_tools/perl/GPT/Algorithms.pm	2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/Algorithms.pm	2008-12-15 08:33:05.000000000 +0100
@@ -1188,9 +1188,9 @@
     return "SRC_2xBUNDLE";
   }
 
+  return "BIN_PKG" if grep { m!share/globus/packages! } @contents;
   return "BIN_PKG" if grep { m!etc/gpt/packages! } @contents;
   return "BIN_PKG" if grep { m!etc/globus_packages! } @contents;
-##  return "BIN_PKG" if grep { m!etc/gpt/packages! } @contents;
   return "SRC_PKG" if grep { m!pkgdata! } @contents;
   return "SRC_PKG" if grep { m!pkg_data_src.gpt! } @contents;
 
diff -ur gpt.orig/packaging_tools/perl/GPT/FilelistFunctions.pm gpt/packaging_tools/perl/GPT/FilelistFunctions.pm
--- gpt.orig/packaging_tools/perl/GPT/FilelistFunctions.pm	2007-08-08 01:07:51.000000000 +0200
+++ gpt/packaging_tools/perl/GPT/FilelistFunctions.pm	2008-12-15 08:33:05.000000000 +0100
@@ -81,6 +81,7 @@
   #check for the existance of packaging data files
   for my $pkgtype (@Grid::GPT::V1::Definitions::package_types) {
     my $pkgdatadir = "$me->{'locations'}->{'pkgdir'}/$name";
+    my $oldpkgdatadir = "$me->{'locations'}->{'oldpkgdir'}/$name";
     my $altpkgdatadir = "$me->{'locations'}->{'altpkgdir'}/$name";
     my ($filelistname, $pkgdataname) = 
       ("$ {flavor}_$ {pkgtype}.filelist",
@@ -92,12 +93,18 @@
     $filelistname = "$pkgdatadir/$filelistname" 
       if -f "$pkgdatadir/$filelistname";
 
+    $filelistname = "$oldpkgdatadir/$filelistname" 
+      if -f "$oldpkgdatadir/$filelistname";
+
     $filelistname = "$altpkgdatadir/$filelistname" 
       if -f "$altpkgdatadir/$filelistname";
 
     $pkgdataname = "$pkgdatadir/$pkgdataname" 
       if -f "$pkgdatadir/$pkgdataname";
 
+    $pkgdataname = "$oldpkgdatadir/$pkgdataname" 
+      if -f "oldpkgdatadir/$pkgdataname";
+
     $pkgdataname = "$altpkgdatadir/$pkgdataname" 
       if -f "$altpkgdatadir/$pkgdataname";
 
@@ -108,12 +115,16 @@
     my $pkgdatasubdir = $pkgdatadir;
     $pkgdatasubdir =~ s!$installdir/!!;
 
+    my $oldpkgdatasubdir = $oldpkgdatadir;
+    $oldpkgdatasubdir =~ s!$installdir/!!;
+
     my $altpkgdatasubdir = $altpkgdatadir;
     $altpkgdatasubdir =~ s!$installdir/!!;
 
 
     my @notpkgdata;
     @notpkgdata = grep { ! m!$pkgdatasubdir!} 
+      grep { ! m!$oldpkgdatasubdir!}
       grep { ! m!$altpkgdatasubdir!} @$list if defined $list;
 
     #remove empty packages
@@ -671,7 +682,9 @@
   for my $f (@$filelist) {
     my ($dir, $name) = $f =~ m!(.+)/([^/]+)$!;
 
-    next if $dir =~  m!/etc/\w+packages!;
+    next if $dir =~  m!/share/globus/packages!;
+    next if $dir =~  m!/etc/gpt/packages!;
+    next if $dir =~  m!/etc/globus_packages!;
 
     $dir = "$installdir/$dir";
 
diff -ur gpt.orig/packaging_tools/perl/GPT/Filelist.pm gpt/packaging_tools/perl/GPT/Filelist.pm
--- gpt.orig/packaging_tools/perl/GPT/Filelist.pm	2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/Filelist.pm	2008-12-15 08:33:05.000000000 +0100
@@ -59,13 +59,11 @@
 sub reset {
   my $self = shift;
   $self->{'list'} = [];
-##  @{$self->{'list'}} = grep { $_->{'dir'} !~ m!etc/globus_packages/! }
-
-  @{$self->{'list'}} = grep { $_->{'dir'} !~ m!etc/gpt/packages/! } 
+  @{$self->{'list'}} = grep { $_->{'dir'} !~ m!share/globus/packages/! }
+    grep { $_->{'dir'} !~ m!etc/gpt/packages/! }
     grep { $_->{'dir'} !~ m!etc/globus_packages/! }
       @{$self->{'fulllist'}};
 
-
 # need to leave this because of bug that leaves noinst files in the root dir.
   @{$self->{'list'}} = grep { $_->{'dir'} =~ m!\w+! 
                                 or $_->{'name'} =~ m!\.xml!
@@ -228,8 +226,7 @@
   my $list = $self->{'list'};
   my @newlist;
   for (@{$list}) {
-##    if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|include|lib|setup|etc/globus_packages)(?:/|$)!) {
-    if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|include|lib|setup|etc/gpt/packages)(?:/|$)!) {
+    if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|include|lib|setup|share/globus/packages)(?:/|$)!) {
       push @newlist, $_;
     }
   }
diff -ur gpt.orig/packaging_tools/perl/GPT/FilelistSort.pm gpt/packaging_tools/perl/GPT/FilelistSort.pm
--- gpt.orig/packaging_tools/perl/GPT/FilelistSort.pm	2008-04-07 18:33:10.000000000 +0200
+++ gpt/packaging_tools/perl/GPT/FilelistSort.pm	2008-12-15 08:33:05.000000000 +0100
@@ -56,8 +56,8 @@
 sub reset {
   my $self = shift;
   $self->{'list'} = [];
-##  @{$self->{'list'}} = grep { $_->{'dir'} !~ m!etc/globus_packages/! }
-  @{$self->{'list'}} = grep { $_->{'dir'} !~ m!etc/gpt/packages/! }
+  @{$self->{'list'}} = grep { $_->{'dir'} !~ m!share/globus/packages/! }
+    grep { $_->{'dir'} !~ m!etc/gpt/packages/! }
     grep { $_->{'dir'} !~ m!etc/globus_packages/! }
       @{$self->{'fulllist'}};
 
@@ -225,8 +225,7 @@
   my $list = $self->{'list'};
   my @newlist;
   for (@{$list}) {
-##    if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|include|lib|setup|etc/globus_packages)(?:/|$)!) {
-    if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|include|lib|setup|etc/gpt/packages)(?:/|$)!) {
+    if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|include|lib|setup|share/globus/packages)(?:/|$)!) {
       push @newlist, $_;
     }
   }
diff -ur gpt.orig/packaging_tools/perl/GPT/Installation.pm gpt/packaging_tools/perl/GPT/Installation.pm
--- gpt.orig/packaging_tools/perl/GPT/Installation.pm	2006-01-11 17:56:48.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/Installation.pm	2008-12-15 08:45:47.000000000 +0100
@@ -74,8 +74,7 @@
 
       # Check to see if version checking is disabled for this location.
       my $gptdir = $me->{'locations'}->{'pkgdir'};
-      $gptdir =~ s!globus_packages!gpt!;
-##      $gptdir =~ s!gpt/packages!gpt!;
+      $gptdir =~ s!globus/packages!globus!;
 
       $me->{'disable_version_checking'} = 1 
         if -e "$gptdir/disable_version_checking" 
diff -ur gpt.orig/packaging_tools/perl/GPT/Localize.pm gpt/packaging_tools/perl/GPT/Localize.pm
--- gpt.orig/packaging_tools/perl/GPT/Localize.pm	2008-12-15 08:32:40.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/Localize.pm	2008-12-15 08:43:33.000000000 +0100
@@ -16,7 +16,7 @@
   sub get_target {
     my $gpath = shift;
     return $target if defined $target;
-    $target = `$gpath/share/gpt/config.guess`;
+    $target = `$gpath/share/globus/config.guess`;
     chomp($target);
     return $target;
   }
diff -ur gpt.orig/packaging_tools/perl/GPT/Locations.pm gpt/packaging_tools/perl/GPT/Locations.pm
--- gpt.orig/packaging_tools/perl/GPT/Locations.pm	2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/Locations.pm	2008-12-15 08:40:31.000000000 +0100
@@ -30,6 +30,7 @@
              gpt_amdir => undef,
              gpt_aclocaldir => undef,
              pkgdir => undef,
+             oldpkgdir => undef,
              altpkgdir => undef,
              bundledir => undef,
              setupdir => undef,
@@ -65,9 +66,9 @@
 sub _init_gptdir {
   my ($me) =@_;
   my $gptdir = $ENV{'GPT_LOCATION'};
-  $me->{'gpt_etcdir'} = "$gptdir/etc/gpt";
-  $me->{'gpt_amdir'} = "$gptdir/share/gpt/amdir";
-  $me->{'gpt_aclocaldir'} = "$gptdir/share/gpt/aclocal";
+  $me->{'gpt_etcdir'} = "$gptdir/share/globus";
+  $me->{'gpt_amdir'} = "$gptdir/share/globus/amdir";
+  $me->{'gpt_aclocaldir'} = "$gptdir/share/globus/aclocal";
 }
 
 sub _init_tmpdir {
@@ -87,10 +88,22 @@
   if ($args{'mode'} eq 'install' ) {
     Grid::GPT::FilelistFunctions::mkinstalldir($me->{'bundledir'});
     Grid::GPT::FilelistFunctions::mkinstalldir($me->{'setupdir'});
-    my $startdir = cwd();
-    chdir "$me->{'installdir'}/etc";
-    my $result = `ln -s gpt/packages globus_packages` 
-      if ! -d "globus_packages";
+    my $amdir = $me->{'gpt_amdir'};
+    $amdir =~ s!globus/amdir!gpt_amdir!;
+    if (-d "$amdir") {
+      Grid::GPT::FilelistFunctions::mkinstalldir("$me->{'installdir'}/etc/gpt");
+      Grid::GPT::FilelistFunctions::mkinstalldir("$me->{'installdir'}/share/globus/aclocal");
+      Grid::GPT::FilelistFunctions::mkinstalldir("$me->{'installdir'}/share/globus/flavors");
+      my $result;
+      $result = `ln -s ../../share/globus/packages $me->{'oldpkgdir'}`
+	if ! -d "$me->{'oldpkgdir'}";
+      $result = `ln -s ../share/globus/packages $me->{'altpkgdir'}`
+	if ! -d "$me->{'altpkgdir'}";
+      $result = `ln -s globus/aclocal $me->{'installdir'}/share/globus_aclocal`
+	if ! -d "$me->{'installdir'}/share/globus_aclocal";
+      $result = `ln -s ../share/globus/flavors $me->{'installdir'}/etc/globus_core`
+	if ! -d "$me->{'installdir'}/etc/globus_core";
+    }
     return
   }
   if ($args{'mode'} eq 'build' ) {
@@ -133,16 +146,13 @@
 
   # Determine what kind of package directory we have
 
-  my ($altpkgdir, $pkgdir) = ("etc/globus_packages", "etc/gpt/packages");
+  my ($pkgdir, $oldpkgdir, $altpkgdir) = ("share/globus/packages",
+					  "etc/gpt/packages",
+					  "etc/globus_packages");
 
-  if (-d "$me->{'installdir'}/etc/globus_packages" and 
-      ! -d "$me->{'installdir'}/etc/gpt/packages") {
-    $pkgdir = "etc/globus_packages";
-    $altpkgdir = "etc/gpt/packages";
-  }
-
-  $me->{'bundledir'} = "$me->{'installdir'}/etc/gpt/bundles";
+  $me->{'bundledir'} = "$me->{'installdir'}/share/globus/bundles";
   $me->{'pkgdir'} = "$me->{'installdir'}/$pkgdir";
+  $me->{'oldpkgdir'} = "$me->{'installdir'}/$oldpkgdir";
   $me->{'altpkgdir'} = "$me->{'installdir'}/$altpkgdir";
   $me->{'setupdir'} = "$me->{'installdir'}/$pkgdir/setup";
 }
diff -ur gpt.orig/packaging_tools/perl/GPT/PackageFilelist/flat1.pm gpt/packaging_tools/perl/GPT/PackageFilelist/flat1.pm
--- gpt.orig/packaging_tools/perl/GPT/PackageFilelist/flat1.pm	2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PackageFilelist/flat1.pm	2008-12-15 08:33:05.000000000 +0100
@@ -116,7 +116,7 @@
         $flavor = $pkginfo->flavor();
         $pkgtype = $pkginfo->pkgtype();
 
-        my $tmpPath = "etc/globus_packages/" . $name . "/" . $flavor . "_" . $pkgtype . ".filelist";
+        my $tmpPath = "share/globus/packages/" . $name . "/" . $flavor . "_" . $pkgtype . ".filelist";
         $self->setFilelist( read => $tmpPath );
     }
 
diff -ur gpt.orig/packaging_tools/perl/GPT/PackageFilelist/xml1.pm gpt/packaging_tools/perl/GPT/PackageFilelist/xml1.pm
--- gpt.orig/packaging_tools/perl/GPT/PackageFilelist/xml1.pm	2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PackageFilelist/xml1.pm	2008-12-15 08:33:05.000000000 +0100
@@ -116,7 +116,7 @@
         $flavor = $pkginfo->flavor();
         $pkgtype = $pkginfo->pkgtype();
 
-        my $tmpPath = "etc/globus_packages/" . $name . "/" . $flavor . "_" . $pkgtype . "_filelist.xml";
+        my $tmpPath = "share/globus/packages/" . $name . "/" . $flavor . "_" . $pkgtype . "_filelist.xml";
         $self->setFilelist( read => $tmpPath, write => $tmpPath );
     }
 
diff -ur gpt.orig/packaging_tools/perl/GPT/PackageFilelist.pm gpt/packaging_tools/perl/GPT/PackageFilelist.pm
--- gpt.orig/packaging_tools/perl/GPT/PackageFilelist.pm	2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PackageFilelist.pm	2008-12-15 08:33:05.000000000 +0100
@@ -435,8 +435,7 @@
         return undef;
     }
 
-    my $str = "etc/globus_packages/"
-##    my $str = "etc/gpt/packages/"
+    my $str = "share/globus/packages/"
               . $self->getPkgInfo()->pkgname()
               . "/pkg_data_"
               . $self->getPkgInfo()->flavor()
diff -ur gpt.orig/packaging_tools/perl/GPT/PkgDist.pm gpt/packaging_tools/perl/GPT/PkgDist.pm
--- gpt.orig/packaging_tools/perl/GPT/PkgDist.pm	2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PkgDist.pm	2008-12-15 08:33:05.000000000 +0100
@@ -162,6 +162,7 @@
       return undef;
     }
 
+    return $f if $f =~ m!share/globus/packages!;
     return $f if $f =~ m!etc/gpt/packages!;
     return $f if $f =~ m!etc/globus_packages!;
     return undef;
diff -ur gpt.orig/packaging_tools/perl/GPT/PkgFileName.pm gpt/packaging_tools/perl/GPT/PkgFileName.pm
--- gpt.orig/packaging_tools/perl/GPT/PkgFileName.pm	2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PkgFileName.pm	2008-12-15 08:33:05.000000000 +0100
@@ -32,7 +32,8 @@
   my $coreflavors = new Grid::GPT::V1::BuildFlavors(core =>1);
   push @{$me->{'flavors'}}, @{$coreflavors->{'flavors'}};
 
-  if (-d "$me->{'locations'}->{'installdir'}/etc/globus_core") {
+  if (-d "$me->{'locations'}->{'installdir'}/share/globus/flavors" or
+      -d "$me->{'locations'}->{'installdir'}/etc/globus_core") {
     my $installedflavors = new Grid::GPT::V1::BuildFlavors(installed => 1,
                                                            locations => 
                                                            $me->{'locations'});
diff -ur gpt.orig/packaging_tools/perl/GPT/PkgMngmt/Archive.pm gpt/packaging_tools/perl/GPT/PkgMngmt/Archive.pm
--- gpt.orig/packaging_tools/perl/GPT/PkgMngmt/Archive.pm	2008-12-15 08:32:40.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PkgMngmt/Archive.pm	2008-12-15 08:33:05.000000000 +0100
@@ -310,7 +310,8 @@
 
   for my $f (@$rawfilelist) {
     $f =~ s!^/+!!;
-    $f =~ s!etc/globus_packages/!etc/gpt/packages/!;
+    $f =~ s!etc/gpt/packages/!share/globus/packages/!;
+    $f =~ s!etc/globus_packages/!share/globus/packages/!;
     push @filelist, $f;
   }
 
@@ -380,7 +381,8 @@
   my $rawfilelist = $filelist;
   $filelist = [];
   for my $f (@$rawfilelist) {
-    $f =~ s!etc/globus_packages/!etc/gpt/packages/!;
+    $f =~ s!etc/gpt/packages/!share/globus/packages/!;
+    $f =~ s!etc/globus_packages/!share/globus/packages/!;
     push @$filelist, $f;
   }
 
diff -ur gpt.orig/packaging_tools/perl/GPT/PkgMngmt/SetupBuildFlavors.pm gpt/packaging_tools/perl/GPT/PkgMngmt/SetupBuildFlavors.pm
--- gpt.orig/packaging_tools/perl/GPT/PkgMngmt/SetupBuildFlavors.pm	2006-01-11 17:56:49.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/PkgMngmt/SetupBuildFlavors.pm	2008-12-15 08:33:05.000000000 +0100
@@ -32,7 +32,7 @@
         {
           die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
         }
-      $environment{'core_src'} = "$gpath/etc/gpt";
+      $environment{'core_src'} = "$gpath/share/globus";
 
       $environment{'core_src'} .= "/globus_core-src.tar.gz";
 
diff -ur gpt.orig/packaging_tools/perl/GPT/Setup.pm gpt/packaging_tools/perl/GPT/Setup.pm
--- gpt.orig/packaging_tools/perl/GPT/Setup.pm	2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/Setup.pm	2008-12-15 08:33:05.000000000 +0100
@@ -135,7 +135,7 @@
 =item finish
 
 Writes metatdata into
-$GLOBUS_LOCATION/etc/globus_packages/setup/<setup_format_name> to
+$GLOBUS_LOCATION/share/globus/packages/setup/<setup_format_name> to
 indicate that the setup is complete.
 
 =head1 AUTHOR
diff -ur gpt.orig/packaging_tools/perl/GPT/V1/BuildFlavors.pm gpt/packaging_tools/perl/GPT/V1/BuildFlavors.pm
--- gpt.orig/packaging_tools/perl/GPT/V1/BuildFlavors.pm	2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/V1/BuildFlavors.pm	2008-12-15 08:33:05.000000000 +0100
@@ -32,7 +32,7 @@
       {
         $gpath = $ENV{GLOBUS_LOCATION};
       }
-    my $confdir = "$gpath/etc/gpt";
+    my $confdir = "$gpath/share/globus";
 
     if (defined $args{'core'}) {
 
@@ -63,7 +63,22 @@
 
       $me->{'flavors'} = [];
 
-      if (-d "$gpath/etc/globus_core") {
+      if (-d "$gpath/share/globus/flavors") {
+        opendir(CONFDIR, "$gpath/share/globus/flavors") 
+          || die "ERROR:BuildFlavors: $gpath/share/globus/flavors cannot be accessed\n";
+
+        my @flavorfiles = grep {m!flavor_\w+.gpt!} readdir(CONFDIR);
+
+        closedir(CONFDIR);
+        for my $ff (@flavorfiles) {
+          my $obj = 
+            new Grid::GPT::V1::FlavorDefinition(xmlfile => 
+                                            "$gpath/share/globus/flavors/$ff");
+          $me->{$obj->{'name'}} = $obj;
+          push @{$me->{'flavors'}}, $obj->{'name'};
+        }
+      }
+      elsif (-d "$gpath/etc/globus_core") {
         opendir(CONFDIR, "$gpath/etc/globus_core") 
           || die "ERROR:BuildFlavors: $gpath/etc/globus_core cannot be accessed\n";
 
@@ -79,7 +94,7 @@
         }
       }
     }
-##print Dumper $me;
+
     return $me;
 }
 
diff -ur gpt.orig/packaging_tools/perl/GPT/V1/Bundle.pm gpt/packaging_tools/perl/GPT/V1/Bundle.pm
--- gpt.orig/packaging_tools/perl/GPT/V1/Bundle.pm	2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/V1/Bundle.pm	2008-12-15 08:33:05.000000000 +0100
@@ -849,7 +849,7 @@
   my $self      = shift;		
   my $globusdir = shift;
 
-  my $bndlDir   = "$globusdir/etc/gpt/bundles/$self->{'Name'}";
+  my $bndlDir   = "$globusdir/share/globus/bundles/$self->{'Name'}";
 
   if (!(-e "$bndlDir"))
   {
@@ -879,7 +879,7 @@
   my $globusdir = $args{'globusdir'};
   my $file      = $args{'file'};
 
-  my $bndlDir   = "$globusdir/etc/gpt/bundles/$file";
+  my $bndlDir   = "$globusdir/share/globus/bundles/$file";
 
   opendir(DIR, $bndlDir) || die "can't opendir $bndlDir: $!";
   my @dots      = grep { /$file\.gpt-bundle\.xml/ } readdir(DIR);
@@ -893,7 +893,7 @@
   my $self                = shift;		
   my $globusdir           = shift;
 
-  my $bndlDir             = "$globusdir/etc/gpt/bundles/$self->{'Name'}";
+  my $bndlDir             = "$globusdir/share/globus/bundles/$self->{'Name'}";
 
   if( !defined($self->{'BundleFile'}) )
   {
diff -ur gpt.orig/packaging_tools/perl/GPT/V1/Package.pm gpt/packaging_tools/perl/GPT/V1/Package.pm
--- gpt.orig/packaging_tools/perl/GPT/V1/Package.pm	2006-01-11 17:10:11.000000000 +0100
+++ gpt/packaging_tools/perl/GPT/V1/Package.pm	2008-12-15 08:33:05.000000000 +0100
@@ -84,7 +84,7 @@
 {
   my ($self, $name, $f, $t)=@_;
   my $globus=$ENV{GLOBUS_LOCATION};
-  my $path="$globus/etc/globus_packages/$name/pkg_data_".$f."_$t.gpt";
+  my $path="$globus/share/globus/packages/$name/pkg_data_".$f."_$t.gpt";
  
   $self->read_metadata_file($path);
 }
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-build gpt/packaging_tools/perl/scripts/gpt-build
--- gpt.orig/packaging_tools/perl/scripts/gpt-build	2006-01-11 17:56:50.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-build	2008-12-15 08:33:05.000000000 +0100
@@ -227,8 +227,8 @@
 }
 
 if (defined $disable_version_checking) {
-  Grid::GPT::FilelistFunctions::mkinstalldir("$installdir/etc/gpt");
-  my $result = system("touch $installdir/etc/gpt/disable_version_checking")
+  Grid::GPT::FilelistFunctions::mkinstalldir("$installdir/share/globus");
+  my $result = system("touch $installdir/share/globus/disable_version_checking")
 }
 
 # Scan source objects for globus_core
@@ -718,7 +718,7 @@
 =item B<-coresrc>
 
 Use this version of globus_core source rather than the one found in
-$GLOBUS_LOCATION/etc/gpt/globus_core-src.tar.gz.
+$GPT_LOCATION/share/globus/globus_core-src.tar.gz.
 
 =item B<-disable-version-checking>
 
@@ -729,13 +729,13 @@
 used, the version checking is disabled B<permanently> for the
 installation pointed to by $GLOBUS_LOCATION.  This condition can only
 be removed by deleting the file
-$GLOBUS_LOCATION/etc/gpt/disable_version_checking.
+$GLOBUS_LOCATION/share/globus/disable_version_checking.
 
 =item B<-flavor-cfg=FILE>
 
 Use the flavor configurations found in FILE.  The default
 configuration file is
-$GLOBUS_LOCATION/etc/gpt/globus_flavor_labels.conf
+$GPT_LOCATION/share/globus/globus_flavor_labels.conf
 
 =item B<-logdir=DIRECTORY>
 
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-bundle gpt/packaging_tools/perl/scripts/gpt-bundle
--- gpt.orig/packaging_tools/perl/scripts/gpt-bundle	2008-12-15 08:32:40.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-bundle	2008-12-15 08:33:05.000000000 +0100
@@ -922,7 +922,7 @@
 collection of source packages.  These bundles can then distributed be
 installed using I<gpt-install> or I<gpt-build>. A bundle consists of a
 collection of packages and a XML formatted description file. The DTD
-for this file is found in I<$GPT_LOCATION/etc/gpt_bundle.dtd>.
+for this file is found in I<$GPT_LOCATION/share/dtd/gpt_bundle.dtd>.
 
 The script accepts a list of packages from the command line or from an
 inputed bundle description file.  It expands this list to include all
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-config gpt/packaging_tools/perl/scripts/gpt-config
--- gpt.orig/packaging_tools/perl/scripts/gpt-config	2008-12-15 08:32:40.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-config	2008-12-15 08:33:05.000000000 +0100
@@ -153,7 +153,7 @@
 
 
 sub modify_gpt_scripts {
-  open LIST, "$gpath/etc/gpt/gpt_scripts_list";
+  open LIST, "$gpath/share/globus/gpt_scripts_list";
 
   my $list = <LIST>;
 
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt_create_automake_rules gpt/packaging_tools/perl/scripts/gpt_create_automake_rules
--- gpt.orig/packaging_tools/perl/scripts/gpt_create_automake_rules	2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt_create_automake_rules	2008-12-15 08:33:05.000000000 +0100
@@ -61,7 +61,7 @@
 # target types defined by automake
 my @target_types = ("PROGRAMS", "LTLIBRARIES", "LIBRARIES","SCRIPTS", "HEADERS","DATA", "MANS");
 
-my $amdir = "$gpath/share/gpt_amdir";
+my $amdir = "$gpath/share/globus/amdir";
 
 my %excluded_dirs;
 for my $p (@excludes) {
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-deps gpt/packaging_tools/perl/scripts/gpt-deps
--- gpt.orig/packaging_tools/perl/scripts/gpt-deps	2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-deps	2008-12-15 08:46:56.000000000 +0100
@@ -40,9 +40,9 @@
     die("$gpath does not appear to hold a valid GPT installation\n");
 }
 
-if ( ! -d "$globus_path/etc/globus_packages" )
+if ( ! -d "$globus_path/share/globus/packages" )
 {
-    die("Can't find a globus_packages directory to work on in your GLOBUS_LOCATION!\n");
+    die("Can't find a globus/packages directory to work on in your GLOBUS_LOCATION!\n");
 }
 
 #
@@ -85,7 +85,7 @@
 
 my $installation = 
   new Grid::GPT::Installation(
-                              pkgdir => "$globus_path/etc/globus_packages",
+                              pkgdir => "$globus_path/share/globus/packages",
                              );
 
 Pod::Usage::pod2usage(-verbose => 0, 
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-filelist-convert gpt/packaging_tools/perl/scripts/gpt-filelist-convert
--- gpt.orig/packaging_tools/perl/scripts/gpt-filelist-convert	2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-filelist-convert	2008-12-15 08:46:17.000000000 +0100
@@ -34,9 +34,9 @@
     $gpath = $globus_path;
 }
 
-if ( ! -d "$globus_path/etc/globus_packages" )
+if ( ! -d "$globus_path/share/globus/packages" )
 {
-    die("Can't find a globus_packages directory to work on in your GLOBUS_LOCATION!\n");
+    die("Can't find a globus/packages directory to work on in your GLOBUS_LOCATION!\n");
 }
 
 #
@@ -75,7 +75,7 @@
 #
 
 my $installation = new Grid::GPT::Installation(
-                              pkgdir => "$globus_path/etc/globus_packages",
+                              pkgdir => "$globus_path/share/globus/packages",
                               with_filelists => 0,
                               );
 
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-filelist-copy gpt/packaging_tools/perl/scripts/gpt-filelist-copy
--- gpt.orig/packaging_tools/perl/scripts/gpt-filelist-copy	2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-filelist-copy	2008-12-15 08:47:24.000000000 +0100
@@ -34,9 +34,9 @@
     $gpath = $globus_path;
 }
 
-if ( ! -d "$globus_path/etc/globus_packages" )
+if ( ! -d "$globus_path/share/globus/packages" )
 {
-    die("Can't find a globus_packages directory to work on in your GLOBUS_LOCATION!\n");
+    die("Can't find a globus/packages directory to work on in your GLOBUS_LOCATION!\n");
 }
 
 #
@@ -79,7 +79,7 @@
 #
 
 my $installation = new Grid::GPT::Installation(
-                              pkgdir => "$globus_path/etc/globus_packages",
+                              pkgdir => "$globus_path/share/globus/packages",
                               with_filelists => 0,
                               );
 
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-file-remove gpt/packaging_tools/perl/scripts/gpt-file-remove
--- gpt.orig/packaging_tools/perl/scripts/gpt-file-remove	2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-file-remove	2008-12-15 08:46:44.000000000 +0100
@@ -34,9 +34,9 @@
     $gpath = $globus_path;
 }
 
-if ( ! -d "$globus_path/etc/globus_packages" )
+if ( ! -d "$globus_path/share/globus/packages" )
 {
-    die("Can't find a globus_packages directory to work on in your GLOBUS_LOCATION!\n");
+    die("Can't find a globus/packages directory to work on in your GLOBUS_LOCATION!\n");
 }
 
 #
@@ -92,7 +92,7 @@
 if ( ($action eq "both") or ($action eq "filelist") )
 {
     my $installation = new Grid::GPT::Installation(
-                              pkgdir => "$globus_path/etc/globus_packages",
+                              pkgdir => "$globus_path/share/globus/packages",
                               with_filelists => 1,
                               );
 
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-flavor-configuration gpt/packaging_tools/perl/scripts/gpt-flavor-configuration
--- gpt.orig/packaging_tools/perl/scripts/gpt-flavor-configuration	2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-flavor-configuration	2008-12-15 08:33:05.000000000 +0100
@@ -117,10 +117,9 @@
 default is a list of installed flavors.  If the B<-standard> or
 B<-all> flags are used then the script permutes the flavor choices
 listed in the flavor configuration file. The file
-$GPT_LOCATION/etc/globus_package_management/globus_flavor_labels.conf
+$GPT_LOCATION/share/globus/globus_flavor_labels.conf
 is the default.  The possible fields for a flavor are described in the
-file
-<cite>$GPT_LOCATION/etc/globus_package_management/globus_flavors.dtd</cite>
+file $GPT_LOCATION/share/globus/dtd/globus_flavors.dtd
 
 =head1 OPTIONS
 
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-postinstall gpt/packaging_tools/perl/scripts/gpt-postinstall
--- gpt.orig/packaging_tools/perl/scripts/gpt-postinstall	2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-postinstall	2008-12-15 08:47:11.000000000 +0100
@@ -41,9 +41,9 @@
     $gpath = $globus_path;
 }
 
-if ( ! -d "$globus_path/etc/globus_packages" )
+if ( ! -d "$globus_path/share/globus/packages" )
 {
-    die("Can't find a globus_packages directory to work on in your GLOBUS_LOCATION!\n");
+    die("Can't find a globus/packages directory to work on in your GLOBUS_LOCATION!\n");
 }
 
 @INC = ("$gpath/lib/perl", "$gpath/lib/perl/$Config{'archname'}", @INC);
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-setup gpt/packaging_tools/perl/scripts/gpt-setup
--- gpt.orig/packaging_tools/perl/scripts/gpt-setup	2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-setup	2008-12-15 08:33:05.000000000 +0100
@@ -72,7 +72,7 @@
 
 my $packagedizedir = $gpath;
 
-$packagedizedir .= '/share/globus_aclocal';
+$packagedizedir .= '/share/globus/aclocal';
 
 # establish stuff to be ignored by packagedize
 for (@{ ['CVS', 'RCS', 'pkgdata', 'doxygen'] }) {
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt_sort_filelist gpt/packaging_tools/perl/scripts/gpt_sort_filelist
--- gpt.orig/packaging_tools/perl/scripts/gpt_sort_filelist	2006-01-12 00:05:17.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt_sort_filelist	2008-12-15 08:33:05.000000000 +0100
@@ -116,6 +116,8 @@
 # the filelists later.
 my $pkgdatasubdir = "$locations->{'pkgdir'}";
 $pkgdatasubdir =~ s!$prefix/!!;
+my $oldpkgdatasubdir = "$locations->{'oldpkgdir'}";
+$oldpkgdatasubdir =~ s!$prefix/!!;
 my $altpkgdatasubdir = "$locations->{'altpkgdir'}";
 $altpkgdatasubdir =~ s!$prefix/!!;
 
@@ -158,6 +160,7 @@
     # If this filelist only has package metadata, don't write it!
     my @notpkgdata;
     @notpkgdata = grep { ! m!$pkgdatasubdir!}
+      grep { ! m!$oldpkgdatasubdir!}
       grep { ! m!$altpkgdatasubdir!} @$outlines;
     next if (! @notpkgdata );
 
diff -ur gpt.orig/packaging_tools/perl/scripts/gpt-verify gpt/packaging_tools/perl/scripts/gpt-verify
--- gpt.orig/packaging_tools/perl/scripts/gpt-verify	2006-01-11 17:10:12.000000000 +0100
+++ gpt/packaging_tools/perl/scripts/gpt-verify	2008-12-15 08:46:30.000000000 +0100
@@ -42,9 +42,9 @@
     $gpath = $globus_path;
 }
 
-if ( ! -d "$globus_path/etc/globus_packages" )
+if ( ! -d "$globus_path/share/globus/packages" )
 {
-    die("Can't find a globus_packages directory to work on in your GLOBUS_LOCATION!\n");
+    die("Can't find a globus/packages directory to work on in your GLOBUS_LOCATION!\n");
 }
 
 @INC = ("$gpath/lib/perl", "$gpath/lib/perl/$Config{'archname'}", @INC);
