Changeset 3140

Timestamp:

Apr 16, 2007, 1:28:19 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 ¶

@@ -30 +30 @@
 BEGIN
 {
-  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
+  my $perllibdir = $ENV{'perllibdir'} || $ENV{'UNIXROOT'}.'@datadir@/@PACKAGE@-@APIVERSION@';
+  $perllibdir =~ s/\/\@unixroot/$ENV{'UNIXROOT'}/; # The EMX built perl doesn't know @unixroot.
   unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
 }
@@ -46 +47 @@
 # 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/\/\@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

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

@@ -32 +32 @@
 BEGIN
 {
-  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
+  my $perllibdir = $ENV{'perllibdir'} || $ENV{'UNIXROOT'}.'@datadir@/@PACKAGE@-@APIVERSION@';
+  $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 ¶

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