Warn about existing files in keep-old-files mode (complements 8f390db9).

[chaz/tar] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ba7245fb2cb6ce0f86b0cf91249c1b550c5b3e12..af332d775170fc9790759b2884367269c9067013 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,60 +1,38 @@
 # Main Makefile for GNU tar.
-# Copyright (C) 1994, 1995, 1996, 1997 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-AUTOMAKE_OPTIONS = gnits dist-shar
-
-BABYL = rmail/* admin/*/RMAIL
-EXTRA_DIST = AC-PATCHES AM-PATCHES BI-PATCHES PORTS rebox.el
-SUBDIRS = doc lib intl src scripts po tests
-
-all-local: $(CONFIG_HEADER)
-
-id: ID
-
-ID:
-       cd lib && $(MAKE) $@
-       cd src && $(MAKE) $@
-
-dist-zoo: $(DISTFILES)
-       rm -rf $(distdir)
-       mkdir $(distdir)
-       distdir=`cd $(distdir) && pwd` \
-         && cd $(srcdir) \
-         && automake --include-deps --output-dir=$$distdir
-       @for file in $(DISTFILES); do           \
-         test -f $(distdir)/$$file \
-           || cp -p $(srcdir)/$$file $(distdir)/$$file; \
-       done
-       for subdir in $(SUBDIRS); do            \
-         test -d $(distdir)/$$subdir           \
-         || mkdir $(distdir)/$$subdir          \
-         || exit 1;                            \
-         chmod 777 $(distdir)/$$subdir;        \
-         (cd $$subdir && $(MAKE) dist) || exit 1; \
-       done
-       @sublist="$(DIST_SUBDIRS)";             \
-       for dir in $$sublist; do                \
-         echo copying directory $$dir;         \
-         tar -chf - $$dir | (cd $(distdir) && tar -xBpf -); \
-       done
-       chmod -R a+r $(distdir)
-       find $(distdir) -type f | xargs dosfn
-#      find $(distdir) -type f | xargs recode :ibmpc
-       mv $(distdir) $(PACKAGE)
-       find $(PACKAGE) -type f | zoo ahIq $(PACKAGE).zoo
-       rm -rf $(PACKAGE)
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, 2007,
+# 2009 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 3, 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.
+
+ACLOCAL_AMFLAGS = -I m4
+EXTRA_DIST = ChangeLog.1 Make.rules
+SUBDIRS = doc gnu lib rmt src scripts po tests
+
+dist-hook:
+       $(MAKE) changelog_dir=$(distdir) ChangeLog
+       -rm -f $(distdir).cpio
+       find $(distdir) | cpio -Hcrc -o | \
+          GZIP=$(GZIP_ENV) gzip -c > $(distdir).cpio.gz
+
+distclean-local:
+       -rm -f $(distdir).cpio.gz
+
+include Make.rules
+
+gen_start_date = 2009-03-06
+prev_change_log = ChangeLog.CVS
+changelog_dir = .