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 /Makefile.am | |
parent | 9ec19184fe3df21f20417c4f73ffe46f9610b5c7 (diff) | |
parent | 4f73bb80d1583441ed4a1c681a843fe4d9d5e26c (diff) | |
download | automake-be971a1d87d84d94cc073fcd5dbc6e7105b4d011.tar.gz |
Merge branch 'release' into maintmaint
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index cfe4dd40d..750bc0ec1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ ## Makefile for Automake. -# Copyright (C) 1995-2017 Free Software Foundation, Inc. +# Copyright (C) 1995-2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,7 +15,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/>. ## Might be updated later. CLEANFILES = @@ -69,10 +69,9 @@ generated_file_finalize = $(AM_V_at) \ fi; \ chmod a-w $@-t && mv -f $@-t $@ -# For some tests or targets, we need to have the just-build automake and -# aclocal scripts avaiable on PATH. -extend_PATH = \ - { PATH='$(abs_builddir)/t/wrap$(PATH_SEPARATOR)'$$PATH && export PATH; } +# Wrapper for the build environment. +nodist_noinst_SCRIPTS += pre-inst-env +CLEANFILES += $(noinst_SCRIPTS) # The master location for INSTALL is lib/INSTALL. # This is where "make fetch" will install new versions. @@ -124,12 +123,12 @@ EXTRA_DIST += \ maintainer/syntax-checks.mk # Most work delegated to sub-dir makefile fragments. -include $(srcdir)/bin/Makefile.inc -include $(srcdir)/doc/Makefile.inc -include $(srcdir)/lib/Makefile.inc -include $(srcdir)/lib/Automake/Makefile.inc -include $(srcdir)/lib/am/Makefile.inc -include $(srcdir)/m4/Makefile.inc -include $(srcdir)/t/Makefile.inc +include $(srcdir)/bin/local.mk +include $(srcdir)/doc/local.mk +include $(srcdir)/lib/local.mk +include $(srcdir)/lib/Automake/local.mk +include $(srcdir)/lib/am/local.mk +include $(srcdir)/m4/local.mk +include $(srcdir)/t/local.mk # vim: ft=automake noet |