Replaced env. vars. with script-based paths

recipes/automake/all/conandata.yml

@@ -11,9 +11,6 @@ sources:
   "1.16.2":
     url: "https://ftp.gnu.org/gnu/automake/automake-1.16.2.tar.gz"
     sha256: "b2f361094b410b4acbf4efba7337bdb786335ca09eb2518635a09fb7319ca5c1"
-  "1.16.1":
-    url: "https://ftp.gnu.org/gnu/automake/automake-1.16.1.tar.gz"
-    sha256: "608a97523f97db32f1f5d5615c98ca69326ced2054c9f82e65bade7fc4c9dea8"
 patches:
   "1.16.5":
     - patch_file: "patches/0001-help2man-no-discard-stderr-0.16.4.patch"
@@ -67,16 +64,3 @@ patches:
     - patch_file: "patches/0004-introduce-automake_perllibdir-0.16.2.patch"
       patch_description: "introduce automake perllibdir"
       patch_type: "portability"
-  "1.16.1":
-    - patch_file: "patches/0001-help2man-no-discard-stderr-0.16.1.patch"
-      patch_description: "help2man no discard stderr"
-      patch_type: "portability"
-    - patch_file: "patches/0002-no-perl-path-in-shebang-0.16.1.patch"
-      patch_description: "no perl path in shebang"
-      patch_type: "portability"
-    - patch_file: "patches/0003-remove-embedded-datadirs-introduce-automake-conan-includes-0.16.1.patch"
-      patch_description: "remove embedded datadirs"
-      patch_type: "portability"
-    - patch_file: "patches/0004-introduce-automake_perllibdir-0.16.1.patch"
-      patch_description: "introduce automake perllibdir"
-      patch_type: "portability"

recipes/automake/all/patches/0003-remove-embedded-datadirs-introduce-automake-conan-includes-0.16.2.patch

@@ -1,15 +1,16 @@
 --- bin/aclocal.in
 +++ bin/aclocal.in
-@@ -62,8 +62,8 @@
+@@ -62,8 +62,10 @@
  # ACLOCAL_PATH environment variable, and reset with the '--system-acdir'
  # option.
  my @user_includes = ();
 -my @automake_includes = ('@datadir@/aclocal-' . $APIVERSION);
 -my @system_includes = ('@datadir@/aclocal');
-+my @automake_includes = ($ENV{"AUTOMAKE_DATADIR"} . '/aclocal-' . $APIVERSION);
-+my @system_includes = ($ENV{"AUTOMAKE_DATADIR"} . '/aclocal');
++my $scriptpath = abs_path(dirname(__FILE__));
++my @automake_includes = "$scriptpath/../res/aclocal-$APIVERSION";
++my @system_includes = "$scriptpath/../res/aclocal";
 +my @conan_includes = uniq(split(/[:;]/, $ENV{'AUTOMAKE_CONAN_INCLUDES'} || ""));
--
+ 
  # Whether we should copy M4 file in $user_includes[0].
  my $install = 0;
 @@ -445,6 +445,6 @@

recipes/automake/all/patches/0003-remove-embedded-datadirs-introduce-automake-conan-includes-0.16.3.patch

@@ -1,15 +1,16 @@
 --- bin/aclocal.in
 +++ bin/aclocal.in
-@@ -65,8 +65,8 @@
+@@ -65,8 +65,10 @@
  # ACLOCAL_PATH environment variable, and reset with the '--system-acdir'
  # option.
  my @user_includes = ();
 -my @automake_includes = ('@datadir@/aclocal-' . $APIVERSION);
 -my @system_includes = ('@datadir@/aclocal');
-+my @automake_includes = ($ENV{"AUTOMAKE_DATADIR"} . '/aclocal-' . $APIVERSION);
-+my @system_includes = ($ENV{"AUTOMAKE_DATADIR"} . '/aclocal');
++my $scriptpath = abs_path(dirname(__FILE__));
++my @automake_includes = "$scriptpath/../res/aclocal-$APIVERSION";
++my @system_includes = "$scriptpath/../res/aclocal";
 +my @conan_includes = uniq(split(/[:;]/, $ENV{'AUTOMAKE_CONAN_INCLUDES'} || ""));
--
+ 
  # Whether we should copy M4 file in $user_includes[0].
  my $install = 0;
 @@ -448,6 +448,6 @@

recipes/automake/all/patches/0004-introduce-automake_perllibdir-0.16.2.patch

@@ -1,23 +1,34 @@
 --- bin/aclocal.in
 +++ bin/aclocal.in
-@@ -21,7 +21,8 @@
+@@ -20,8 +20,13 @@
+ # Alexandre Duret-Lutz <adl@gnu.org>.
 
++use Cwd 'abs_path';
++use File::Basename;
++
  BEGIN
  {
 -  unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
-+  my $pkgdatadir = $ENV{"AUTOMAKE_PERLLIBDIR"} || '@datadir@/@PACKAGE@-@APIVERSION@';
++  my $scriptpath = abs_path(dirname(__FILE__));
++  my $pkgdatadir = "$scriptpath/../@datadir@/@PACKAGE@-@APIVERSION@";
 +  unshift (@INC, $pkgdatadir)
      unless $ENV{AUTOMAKE_UNINSTALLED};
  }
 
 --- bin/automake.in
 +++ bin/automake.in
-@@ -26,7 +26,8 @@
+@@ -25,8 +25,14 @@
+ use strict;
 
++use Cwd 'abs_path';
++use File::Basename;
++
  BEGIN
  {
 -  unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
-+  my $pkgdatadir = $ENV{"AUTOMAKE_PERLLIBDIR"} || '@datadir@/@PACKAGE@-@APIVERSION@';
++  my $scriptpath = abs_path(dirname(__FILE__));
++  $ENV{'AUTOMAKE_LIBDIR'} = "$scriptpath/../@datadir@/@PACKAGE@-@APIVERSION@" if ! exists $ENV{'AUTOMAKE_LIBDIR'};
++  my $pkgdatadir = "$scriptpath/../@datadir@/@PACKAGE@-@APIVERSION@";
 +  unshift (@INC, $pkgdatadir)
      unless $ENV{AUTOMAKE_UNINSTALLED};
 

recipes/automake/all/patches/0004-introduce-automake_perllibdir-0.16.3.patch

@@ -1,23 +1,34 @@
 --- bin/aclocal.in
 +++ bin/aclocal.in
-@@ -25,7 +25,8 @@
-
+@@ -24,8 +24,13 @@
+ use warnings FATAL => 'all';
+
++use Cwd 'abs_path';
++use File::Basename;
++
  BEGIN
  {
 -  unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
-+  my $pkgdatadir = $ENV{"AUTOMAKE_PERLLIBDIR"} || '@datadir@/@PACKAGE@-@APIVERSION@';
++  my $scriptpath = abs_path(dirname(__FILE__));
++  my $pkgdatadir = "$scriptpath/../@datadir@/@PACKAGE@-@APIVERSION@";
 +  unshift (@INC, $pkgdatadir)
      unless $ENV{AUTOMAKE_UNINSTALLED};
  }
 
 --- bin/automake.in
 +++ bin/automake.in
-@@ -28,7 +28,8 @@
+@@ -27,8 +27,14 @@
+ use warnings FATAL => 'all';
 
++use Cwd 'abs_path';
++use File::Basename;
++
  BEGIN
  {
 -  unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
-+  my $pkgdatadir = $ENV{"AUTOMAKE_PERLLIBDIR"} || '@datadir@/@PACKAGE@-@APIVERSION@';
++  my $scriptpath = abs_path(dirname(__FILE__));
++  $ENV{'AUTOMAKE_LIBDIR'} = "$scriptpath/../@datadir@/@PACKAGE@-@APIVERSION@" if ! exists $ENV{'AUTOMAKE_LIBDIR'};
++  my $pkgdatadir = "$scriptpath/../@datadir@/@PACKAGE@-@APIVERSION@";
 +  unshift (@INC, $pkgdatadir)
      unless $ENV{AUTOMAKE_UNINSTALLED};
 

recipes/automake/config.yml

@@ -7,5 +7,4 @@ versions:
     folder: all
   "1.16.2":
     folder: all
-  "1.16.1":
-    folder: all
+