X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=build-aux%2FGNUmakefile;h=35c8869de5bb94601a401f26d3117487d29170f0;hb=c29717fb753f81891cb6e4274adaf11a0bcba374;hp=f8293b2588fc9d5649f0f3a1f9940af9b70abdef;hpb=80bdb2b015a82eb6c96c8622177111592b98869b;p=gnulib.git

diff --git a/build-aux/GNUmakefile b/build-aux/GNUmakefile
index f8293b258..35c8869de 100644
--- a/build-aux/GNUmakefile
+++ b/build-aux/GNUmakefile
@@ -4,21 +4,20 @@
 # It is necessary if you want to build targets usually of interest
 # only to the maintainer.
 
-# Copyright (C) 2001, 2003, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2006, 2007 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Systems where /bin/sh is not the default shell need this.  The $(shell)
 # command below won't work with e.g. stock DOS/Windows shells.
@@ -38,15 +37,15 @@ have-Makefile := $(shell test -f Makefile && echo yes)
 ifeq ($(have-Makefile),yes)
 
 include Makefile
--include $(srcdir)/Makefile.cfg
-include $(srcdir)/Makefile.maint
+-include $(srcdir)/maint-cfg.mk
+include $(srcdir)/maint.mk
 
 else
 
 .DEFAULT_GOAL := abort-due-to-no-makefile
 
--include ./Makefile.cfg
-include ./Makefile.maint
+-include ./maint-cfg.mk
+include ./maint.mk
 
 abort-due-to-no-makefile:
 	@echo There seems to be no Makefile in this directory.   1>&2