Changeset 3142 for trunk

Timestamp:

Apr 16, 2007, 1:44:04 AM (18 years ago)

Author:

bird

Message:

Unixroot.

Location:

trunk/essentials/sys-devel/automake-1.8

Files:

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

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

@@ -31 +31 @@
 {
   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);
@@ -48 +49 @@
 # Note also that the versioned directory is handled later.
 $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;

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

@@ -33 +33 @@
 {
   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.8/lib/Automake/Config.in

@@ -34 +34 @@
 $VERSION = '@VERSION@';
 $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.