diff options
author | Mathieu Lirzin <mthl@gnu.org> | 2018-02-25 23:03:05 +0100 |
---|---|---|
committer | Mathieu Lirzin <mthl@gnu.org> | 2018-02-25 23:03:05 +0100 |
commit | be971a1d87d84d94cc073fcd5dbc6e7105b4d011 (patch) | |
tree | f530fc501658a6cc29d10fa3d5d9c1c08b193766 /lib/Automake/Config.in | |
parent | 9ec19184fe3df21f20417c4f73ffe46f9610b5c7 (diff) | |
parent | 4f73bb80d1583441ed4a1c681a843fe4d9d5e26c (diff) | |
download | automake-be971a1d87d84d94cc073fcd5dbc6e7105b4d011.tar.gz |
Merge branch 'release' into maintmaint
Diffstat (limited to 'lib/Automake/Config.in')
-rw-r--r-- | lib/Automake/Config.in | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in index 9437eca9d..6edac116b 100644 --- a/lib/Automake/Config.in +++ b/lib/Automake/Config.in @@ -1,5 +1,5 @@ # -*- Perl -*- -# Copyright (C) 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # @configure_input@ # This program is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. package Automake::Config; use strict; @@ -32,7 +32,7 @@ our $PACKAGE = '@PACKAGE@'; our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@'; our $VERSION = '@VERSION@'; our $RELEASE_YEAR = '@RELEASE_YEAR@'; -our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; +our $libdir = $ENV{"AUTOMAKE_LIBDIR"} || '@datadir@/@PACKAGE@-@APIVERSION@'; our $perl_threads = 0; # We need at least this version for CLONE support. @@ -43,20 +43,3 @@ if (eval { require 5.007_002; }) } 1; - -### Setup "GNU" style for perl-mode and cperl-mode. -## Local Variables: -## perl-indent-level: 2 -## perl-continued-statement-offset: 2 -## perl-continued-brace-offset: 0 -## perl-brace-offset: 0 -## perl-brace-imaginary-offset: 0 -## perl-label-offset: -2 -## cperl-indent-level: 2 -## cperl-brace-offset: 0 -## cperl-continued-brace-offset: 0 -## cperl-label-offset: -2 -## cperl-extra-newline-before-brace: t -## cperl-merge-trailing-else: nil -## cperl-continued-statement-offset: 2 -## End: |