Changeset 3150

Timestamp:

Apr 16, 2007, 4:19:20 AM (18 years ago)

Author:

bird

Message:

Unixroot and the drive letter fix.

Location:

trunk/essentials/sys-devel/automake-1.10

Files:

• aclocal.in (modified) (3 diffs)
• automake.in (modified) (1 diff)
• lib/Automake/Config.in (modified) (1 diff)

trunk/essentials/sys-devel/automake-1.10/aclocal.in

@@ -31 +31 @@
 BEGIN
 {
-  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
+  my $perllibdir = $ENV{'perllibdir'} || $ENV{'UNIXROOT'}.'@datadir@/@PACKAGE@-@APIVERSION@';
+  $perllibdir =~ s/$ENV{'UNIXROOT'}\/\@unixroot/$ENV{'UNIXROOT'}/; # The EMX built perl doesn't know @unixroot.
+  $perllibdir =~ s/\/\@unixroot/$ENV{'UNIXROOT'}/; # The EMX built perl doesn't know @unixroot.
   unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
 }
@@ -57 +59 @@
 # --acdir will reset both @automake_includes and @system_includes.
 my @user_includes = ();
-my @automake_includes = ("@datadir@/aclocal-$APIVERSION");
-my @system_includes = ('@datadir@/aclocal');
+my $my_acdir = $ENV{'UNIXROOT'}.'@datadir@/aclocal';
+$my_acdir =~ s/$ENV{'UNIXROOT'}\/\@unixroot/$ENV{'UNIXROOT'}/; # The EMX built perl doesn't know @unixroot.
+$my_acdir =~ s/\/\@unixroot/$ENV{'UNIXROOT'}/; # The EMX built perl doesn't know @unixroot.
+my @automake_includes = ("$my_acdir-$APIVERSION");
+my @system_includes = ("$my_acdir");
 
 # Whether we should copy M4 file in $user_includes[0].
@@ -675 +680 @@
     {
       chomp;
-      my ($file, $macro, $arg1) = split (/::/);
+      # Stupid, stupid unix guys.
+      #my ($file, $macro, $arg1) = split (/:/);
+      my ($file, $macro, $arg1, $dos) = split (/:/);
+      if (length($file) == 1 && $dos ne '')
+        {
+          $file = $file.":".$macro;
+          $macro = $arg1;
+          $arg1 = $dos;
+        }
 
       $traced{$macro} = 1 if exists $macro_seen{$macro};

trunk/essentials/sys-devel/automake-1.10/automake.in

@@ -33 +33 @@
 BEGIN
 {
-  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
+  my $perllibdir = $ENV{'perllibdir'} || $ENV{'UNIXROOT'}.'@datadir@/@PACKAGE@-@APIVERSION@';
+  $perllibdir =~ s/$ENV{'UNIXROOT'}\/\@unixroot/$ENV{'UNIXROOT'}/; # The EMX built perl doesn't know @unixroot.
+  $perllibdir =~ s/\/\@unixroot/$ENV{'UNIXROOT'}/; # The EMX built perl doesn't know @unixroot.
   unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
 

trunk/essentials/sys-devel/automake-1.10/lib/Automake/Config.in

@@ -32 +32 @@
 our $VERSION = '@VERSION@';
 our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
+$libdir =~ s/$ENV{'UNIXROOT'}\/\@unixroot/$ENV{'UNIXROOT'}/; # The EMX built perl doesn't know @unixroot.
+$libdir =~ s/\/\@unixroot/$ENV{'UNIXROOT'}/; # The EMX built perl doesn't know @unixroot.
+
 
 1;;