Changeset 3143

Timestamp:

Apr 16, 2007, 3:31:41 AM (18 years ago)

Author:

bird

Message:

Unixroot and one silly ':' issue.

Location:

trunk/essentials/sys-devel/automake-1.9

Files:

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

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

@@ -30 +30 @@
 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);
 }
@@ -46 +48 @@
 # Note that this isn't pkgdatadir, but a separate directory.
 # Note also that the versioned directory is handled later.
-$acdir = '@datadir@/aclocal';
+$acdir = $ENV{'UNIXROOT'}.'@datadir@/aclocal';
+$acdir =~ s/$ENV{'UNIXROOT'}\/\@unixroot/$ENV{'UNIXROOT'}/; # The EMX built perl doesn't know @unixroot.
+$acdir =~ s/\/\@unixroot/$ENV{'UNIXROOT'}/; # The EMX built perl doesn't know @unixroot.
 $default_acdir = $acdir;
 # contains a list of directories, one per line, to be added
@@ -425 +429 @@
     {
       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 $macro_seen{$macro};

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

@@ -32 +32 @@
 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.9/lib/Automake/Config.in

@@ -33 +33 @@
 $PACKAGE = '@PACKAGE@';
 $VERSION = '@VERSION@';
-$libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
+$libdir = $ENV{'UNIXROOT'}.'@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;;