Changeset 3139

Timestamp:

Apr 16, 2007, 12:57:34 AM (18 years ago)

Author:

bird

Message:

UNIXROOT

Location:

trunk/essentials/sys-devel/automake-1.7

Files:

• aclocal.in (modified) (2 diffs)
• automake.in (modified) (2 diffs)

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

@@ -30 +30 @@
 BEGIN
 {
-  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
+  my $perllibdir = $ENV{'perllibdir'} || $ENV{'UNIXROOT'}.'@datadir@/@PACKAGE@-@APIVERSION@';
   unshift @INC, $perllibdir;
 }
@@ -43 +43 @@
 # 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';
 $default_acdir = $acdir;
 # contains a list of directories, one per line, to be added

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

@@ -32 +32 @@
 BEGIN
 {
-  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
+  my $perllibdir = $ENV{'perllibdir'} || $ENV{'UNIXROOT'}.'@datadir@/@PACKAGE@-@APIVERSION@';
   unshift @INC, $perllibdir;
 
@@ -136 +136 @@
 my $VERSION = '@VERSION@';
 my $PACKAGE = '@PACKAGE@';
-my $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
+my $libdir = $ENV{'UNIXROOT'}.'@datadir@/@PACKAGE@-@APIVERSION@';
 
 # Some regular expressions.  One reason to put them here is that it