From 7cb794dcdddf4a4e20c5355d1912600889e5d1b6 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Tue, 23 Sep 2008 15:02:44 +0200 Subject: [PATCH] Remove etc/Makefile.am. * etc/Makefile.am: Rename as... * etc/local.mk: this. Adjust. * Makefile.am, configure.ac: Adjust. --- ChangeLog | 8 ++++++++ Makefile.am | 3 ++- configure.ac | 1 - etc/{Makefile.am => local.mk} | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) rename etc/{Makefile.am => local.mk} (86%) diff --git a/ChangeLog b/ChangeLog index 707aad9d..980bd632 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-11-15 Akim Demaille + + Remove etc/Makefile.am. + * etc/Makefile.am: Rename as... + * etc/local.mk: this. + Adjust. + * Makefile.am, configure.ac: Adjust. + 2008-11-15 Akim Demaille Remove examples/local.mk. diff --git a/Makefile.am b/Makefile.am index 3362bd6f..188a0e3e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,7 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = po runtime-po lib data src doc tests etc +SUBDIRS = po runtime-po lib data src doc tests if BISON_CXX_WORKS SUBDIRS += examples/calc++ endif @@ -34,6 +34,7 @@ EXTRA_DIST = .prev-version .version cfg.mk maint.mk \ djgpp/fnchange.lst djgpp/testsuite.sed include build-aux/local.mk +include etc/local.mk include examples/local.mk .PHONY: maintainer-check diff --git a/configure.ac b/configure.ac index 51e0553f..29117f1d 100644 --- a/configure.ac +++ b/configure.ac @@ -151,7 +151,6 @@ gt_JAVAEXEC AC_CONFIG_FILES([Makefile po/Makefile.in data/Makefile - etc/Makefile examples/calc++/Makefile lib/Makefile src/Makefile doc/Makefile diff --git a/etc/Makefile.am b/etc/local.mk similarity index 86% rename from etc/Makefile.am rename to etc/local.mk index 88966069..e66b1bbb 100644 --- a/etc/Makefile.am +++ b/etc/local.mk @@ -1,4 +1,4 @@ -## Copyright (C) 2006 Free Software Foundation, Inc. +## Copyright (C) 2006, 2008 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 @@ -13,4 +13,4 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -nodist_noinst_SCRIPTS = bench.pl +nodist_noinst_SCRIPTS = etc/bench.pl -- 2.47.2