* aclocal.in (write_aclocal): Updated copyright.

	(parse_arguments): Likewise.
	* automake.in (parse_arguments): Updated copyright.
	(initialize_global_constants): Likewise.
	* Makefile.am (pkgdata_DATA): Renamed from pkgdata_SCRIPTS.
	(install-data-hook): New hook.  Report from Petter Reinholdtsen.

diff --git a/ChangeLog b/ChangeLog
index 1d679a3..4a0a4f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 1999-01-10  Tom Tromey  <tromey@cygnus.com>
 
+       * aclocal.in (write_aclocal): Updated copyright.
+       (parse_arguments): Likewise.
+       * automake.in (parse_arguments): Updated copyright.
+       (initialize_global_constants): Likewise.
+
+       * Makefile.am (pkgdata_DATA): Renamed from pkgdata_SCRIPTS.
+       (install-data-hook): New hook.  Report from Petter Reinholdtsen.
+
        * remake-hdr.am: Provide `else' clause for each `if'.
 
 1999-01-10  Alexandre Oliva  <oliva@dcc.unicamp.br>

diff --git a/Makefile.am b/Makefile.am
index 6533dcf..509c6cb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,10 +20,17 @@ subdirs.am tags-clean.am tags.am texi-vers.am texinfos.am
 
 pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 $(amfiles)
 
-## These must all be executable when installed.
-pkgdata_SCRIPTS = config.guess config.sub install-sh mdate-sh missing \
+## These must all be executable when installed.  However, if we use
+## _SCRIPTS, then the program transform will be applied, which is not
+## what we want.  So we make them executable by hand.
+pkgdata_DATA = config.guess config.sub install-sh mdate-sh missing \
 mkinstalldirs elisp-comp ylwrap acinstall
 
+install-data-hook:
+       @for prog in $(pkgdata_DATA); do \
+         chmod +x $(pkgdatadir)/$$prog; \
+       done
+
 EXTRA_DIST = acinstall $(pkgdata_DATA)
 
 # The following requires a fixed version of the Emacs 19.30 etags.

diff --git a/Makefile.in b/Makefile.in
index a76884f..8e4788e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.3d from Makefile.am
+# Makefile.in generated automatically by automake 1.3e from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -74,9 +74,7 @@ info_TEXINFOS = automake.texi
 amfiles = clean-hdr.am clean-kr.am clean.am comp-vars.am compile.am data-clean.am data.am dejagnu.am depend.am depend2.am dist-vars.am footer.am header-vars.am header.am java-clean.am java.am kr-extra.am library.am libs-clean.am libs.am libtool.am lisp-clean.am lisp.am ltlib-clean.am ltlib.am ltlibrary.am mans-vars.am mans.am multilib.am program.am progs-clean.am progs.am remake-hdr.am remake.am scripts.am subdirs.am tags-clean.am tags.am texi-vers.am texinfos.am
 
 
-pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 $(amfiles)
-
-pkgdata_SCRIPTS = config.guess config.sub install-sh mdate-sh missing mkinstalldirs elisp-comp ylwrap acinstall
+pkgdata_DATA = config.guess config.sub install-sh mdate-sh missing mkinstalldirs elisp-comp ylwrap acinstall
 
 
 EXTRA_DIST = acinstall $(pkgdata_DATA)
@@ -86,7 +84,7 @@ TAGS_DEPENDENCIES = $(ETAGS_ARGS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =  automake aclocal
-SCRIPTS =  $(bin_SCRIPTS) $(pkgdata_SCRIPTS)
+SCRIPTS =  $(bin_SCRIPTS)
 
 TEXI2DVI = texi2dvi
 INFO_DEPS = automake.info
@@ -145,25 +143,6 @@ uninstall-binSCRIPTS:
          rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
        done
 
-install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS)
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-       @list='$(pkgdata_SCRIPTS)'; for p in $$list; do \
-         if test -f $$p; then \
-           echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(pkgdatadir)/`echo $$p|sed '$(transform)'`"; \
-           $(INSTALL_SCRIPT) $$p $(DESTDIR)$(pkgdatadir)/`echo $$p|sed '$(transform)'`; \
-         else if test -f $(srcdir)/$$p; then \
-           echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/`echo $$p|sed '$(transform)'`"; \
-           $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/`echo $$p|sed '$(transform)'`; \
-         else :; fi; fi; \
-       done
-
-uninstall-pkgdataSCRIPTS:
-       @$(NORMAL_UNINSTALL)
-       list='$(pkgdata_SCRIPTS)'; for p in $$list; do \
-         rm -f $(DESTDIR)$(pkgdatadir)/`echo $$p|sed '$(transform)'`; \
-       done
-
 $(srcdir)/version.texi: stamp-vti
        @:
 
@@ -431,9 +410,11 @@ distcheck: dist
          && $(MAKE) $(AM_MAKEFLAGS) installcheck \
          && $(MAKE) $(AM_MAKEFLAGS) dist
        -rm -rf $(distdir)
-       @echo "========================"; \
-       echo "$(distdir).tar.gz is ready for distribution"; \
-       echo "========================"
+       @banner="$(distdir).tar.gz is ready for distribution"; \
+       dashes=`echo "$$banner" | sed s/./=/g`; \
+       echo "$$dashes"; \
+       echo "$$banner"; \
+       echo "$$dashes"
 dist: distdir
        -chmod -R a+r $(distdir)
        GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
@@ -487,24 +468,24 @@ installcheck: installcheck-recursive
 install-exec-am: install-binSCRIPTS
 install-exec: install-exec-recursive
 
-install-data-am: install-info-am install-pkgdataSCRIPTS \
-               install-pkgdataDATA
+install-data-am: install-info-am install-pkgdataDATA
+       @$(NORMAL_INSTALL)
+       $(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-data: install-data-recursive
 
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-recursive
-uninstall-am: uninstall-binSCRIPTS uninstall-pkgdataSCRIPTS \
-               uninstall-info uninstall-pkgdataDATA
+uninstall-am: uninstall-binSCRIPTS uninstall-info uninstall-pkgdataDATA
 uninstall: uninstall-recursive
 all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(DATA)
 all-redirect: all-recursive
 install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+       $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs: installdirs-recursive
 installdirs-am:
-       $(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir) \
-               $(DESTDIR)$(infodir) $(DESTDIR)$(pkgdatadir)
+       $(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) \
+               $(DESTDIR)$(pkgdatadir)
 
 
 mostlyclean-generic:
@@ -541,12 +522,11 @@ maintainer-clean-am:  maintainer-clean-vti maintainer-clean-aminfo \
 maintainer-clean: maintainer-clean-recursive
        -rm -f config.status
 
-.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-pkgdataSCRIPTS \
-install-pkgdataSCRIPTS mostlyclean-vti distclean-vti clean-vti \
-maintainer-clean-vti install-info-am uninstall-info mostlyclean-aminfo \
-distclean-aminfo clean-aminfo maintainer-clean-aminfo \
-uninstall-pkgdataDATA install-pkgdataDATA install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
+.PHONY: uninstall-binSCRIPTS install-binSCRIPTS mostlyclean-vti \
+distclean-vti clean-vti maintainer-clean-vti install-info-am \
+uninstall-info mostlyclean-aminfo distclean-aminfo clean-aminfo \
+maintainer-clean-aminfo uninstall-pkgdataDATA install-pkgdataDATA \
+install-data-recursive uninstall-data-recursive install-exec-recursive \
 uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
 all-recursive check-recursive installcheck-recursive info-recursive \
 dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
@@ -560,6 +540,11 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \
 maintainer-clean
 
 
+install-data-hook:
+       @for prog in $(pkgdata_DATA); do \
+         chmod +x $(pkgdatadir)/$$prog; \
+       done
+
 installcheck-local:
        for file in $(pkgdata_SCRIPTS); do \
          $(PERL) -e "exit ! -x '$(pkgdatadir)/$$file';" || exit 1; \

diff --git a/THANKS b/THANKS
index 57e137d..ada028d 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -70,6 +70,7 @@ Paul Eggert           eggert@twinsun.com
 Per Bothner            bothner@cygnus.com
 Per Cederqvist         ceder@lysator.liu.se
 Peter Mattis           petm@scam.XCF.Berkeley.EDU
+Petter Reinholdtsen    pere@hungry.com
 Phil Nelson            phil@cs.wwu.edu
 Raja R Harinath                harinath@cs.umn.edu
 Ralph Schleicher       rs@purple.UL.BaWue.DE

diff --git a/aclocal.in b/aclocal.in
index a9833de..5ca383e 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -3,7 +3,7 @@
 # @configure_input@
 
 # aclocal - create aclocal.m4 by scanning configure.in
-# Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999 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
@@ -168,7 +168,7 @@ sub parse_arguments
        elsif ($arglist[0] eq '--version')
        {
            print "aclocal (GNU $PACKAGE) $VERSION\n\n";
-           print "Copyright (C) 1998 Free Software Foundation, Inc.\n";
+           print "Copyright (C) 1999 Free Software Foundation, Inc.\n";
            print "This is free software; see the source for copying conditions.  There is NO\n";
            print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n";
            print "Written by Tom Tromey <tromey\@cygnus.com>\n";
@@ -410,7 +410,7 @@ sub write_aclocal
        || die "aclocal: couldn't open \`$output_file' for writing: $!\n";
     print ACLOCAL "dnl $output_file generated automatically by aclocal $VERSION\n";
     print ACLOCAL "\
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.

diff --git a/automake.in b/automake.in
index 8a33c5f..3d5e395 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -389,7 +389,7 @@ sub parse_arguments
        if ($arglist[0] eq "--version")
        {
            print "automake (GNU $PACKAGE) $VERSION\n\n";
-           print "Copyright (C) 1998 Free Software Foundation, Inc.\n";
+           print "Copyright (C) 1999 Free Software Foundation, Inc.\n";
            print "This is free software; see the source for copying conditions.  There is NO\n";
            print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n";
            print "Written by Tom Tromey <tromey\@cygnus.com>\n";
@@ -6115,7 +6115,7 @@ sub initialize_global_constants
 
     # Copyright on generated Makefile.ins.
     $gen_copyright = "\
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 6533dcf..509c6cb 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -20,10 +20,17 @@ subdirs.am tags-clean.am tags.am texi-vers.am texinfos.am
 
 pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 $(amfiles)
 
-## These must all be executable when installed.
-pkgdata_SCRIPTS = config.guess config.sub install-sh mdate-sh missing \
+## These must all be executable when installed.  However, if we use
+## _SCRIPTS, then the program transform will be applied, which is not
+## what we want.  So we make them executable by hand.
+pkgdata_DATA = config.guess config.sub install-sh mdate-sh missing \
 mkinstalldirs elisp-comp ylwrap acinstall
 
+install-data-hook:
+       @for prog in $(pkgdata_DATA); do \
+         chmod +x $(pkgdatadir)/$$prog; \
+       done
+
 EXTRA_DIST = acinstall $(pkgdata_DATA)
 
 # The following requires a fixed version of the Emacs 19.30 etags.

diff --git a/m4/Makefile.in b/m4/Makefile.in
index b2265f6..4bf27b7 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.3d from Makefile.am
+# Makefile.in generated automatically by automake 1.3e from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -155,7 +155,7 @@ uninstall: uninstall-am
 all-am: Makefile $(DATA)
 all-redirect: all-am
 install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+       $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
        $(mkinstalldirs)  $(DESTDIR)$(m4datadir)
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 148bb8c..2de03d5 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.3d from Makefile.am
+# Makefile.in generated automatically by automake 1.3e from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -65,7 +65,7 @@ VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = gnits
 
-TESTS = acinclude.test aclocal.test aclocali.test aclocalii.test acoutnoq.test acoutput.test acoutqnl.test acouttbs.test acsilent.test all.test alpha.test ammissing.test ansi.test ansi2.test ansi3.test auxdir.test backsl.test badline.test badprog.test block.test canon.test canon2.test canon3.test canon4.test checkall.test clean.test colneq.test colneq2.test colon.test colon2.test colon3.test colon4.test colon5.test colon6.test colon7.test comment.test comment2.test compile_f_c_cxx.test cond.test cond2.test cond3.test cond4.test cond5.test cond6.test cond7.test condman.test condman2.test conf2.test confdist.test config.test confincl.test confsub.test      confvar.test confvar2.test cxxcpp.test cxxlibobj.test cxxlink.test cxxnoc.test cxxo.test cygwin32.test defun.test defun2.test dejagnu.test depacl.test depacl2.test depend.test depend2.test depend3.test discover.test distdir.test dup.test dup2.test else.test empty.test error.test exdir.test exdir2.test exsource.test extra.test extra3.test extra4.test flibs.test fnoc.test fo.test fonly.test fpinst2.test fpinstall.test gnits.test implicit.test include.test info.test insh.test insh2.test install.test installsh.test instdata.test instexec.test insthook.test instman.test interp.test interp2.test java.test javaprim.test javasubst.test ldadd.test lex.test lex2.test libobj.test libobj2.test libobj3.test libobj4.test libobj5.test libobj6.test libobj7.test libobj8.test library.test link_c_cxx.test link_f_c.test link_f_c_cxx.test link_f_cxx.test   link_f_only.test lisp.test mdate.test mdate2.test mkinst2.test mkinstall.test noinst.test number.test objc.test obsolete.test order.test outdir.test output.test output2.test output3.test output4.test output5.test package.test parse.test pluseq.test pluseq2.test pluseq3.test pluseq4.test prefix.test primary.test        primary2.test proginst.test ranlib.test recurs.test recurs2.test remake.test remake2.test req.test rulepat.test scripts.test seenc.test sinclude.test spell.test spell2.test spell3.test spelling.test stamph.test stdlib.test subdir.test subdir2.test subst.test symlink.test syntax.test tags.test tagsub.test target.test texinfo.test texinfo2.test texinfo3.test texinfo4.test texinfo5.test texinfo6.test texinfo7.test unused.test version.test version2.test version3.test vpath.test vtexi.test vtexi2.test whoami.test xsource.test yacc.test yaccpp.test
+TESTS = acinclude.test aclocal.test aclocali.test aclocalii.test acoutnoq.test acoutput.test acoutqnl.test acouttbs.test acsilent.test all.test alpha.test ammissing.test ansi.test ansi2.test ansi3.test auxdir.test backsl.test badline.test badprog.test block.test canon.test canon2.test canon3.test canon4.test checkall.test clean.test colneq.test colneq2.test colon.test colon2.test colon3.test colon4.test colon5.test colon6.test colon7.test comment.test comment2.test compile_f_c_cxx.test cond.test cond2.test cond3.test cond4.test cond5.test cond6.test cond7.test condman.test condman2.test conf2.test confdist.test config.test confincl.test confsub.test      confvar.test confvar2.test cxxcpp.test cxxlibobj.test cxxlink.test cxxnoc.test cxxo.test cygwin32.test defun.test defun2.test dejagnu.test depacl.test depacl2.test depend.test depend2.test depend3.test discover.test distdir.test dup.test dup2.test else.test empty.test error.test exdir.test exdir2.test exsource.test extra.test extra3.test extra4.test flibs.test fnoc.test fo.test fonly.test fpinst2.test fpinstall.test gnits.test implicit.test include.test info.test insh.test insh2.test install.test installsh.test instdata.test instexec.test insthook.test instman.test interp.test interp2.test java.test javaprim.test javasubst.test ldadd.test lex.test lex2.test libobj.test libobj2.test libobj3.test libobj4.test libobj5.test libobj6.test libobj7.test libobj8.test library.test link_c_cxx.test link_f_c.test link_f_c_cxx.test link_f_cxx.test   link_f_only.test lisp.test mdate.test mdate2.test mkinst2.test mkinstall.test noinst.test number.test objc.test obsolete.test order.test outdir.test output.test output2.test output3.test output4.test output5.test package.test parse.test pluseq.test pluseq2.test pluseq3.test pluseq4.test pluseq5.test prefix.test        primary.test primary2.test proginst.test ranlib.test recurs.test recurs2.test remake.test remake2.test req.test rulepat.test scripts.test seenc.test sinclude.test spell.test spell2.test spell3.test spelling.test stamph.test stdlib.test subdir.test subdir2.test subst.test symlink.test syntax.test tags.test tagsub.test target.test texinfo.test texinfo2.test texinfo3.test texinfo4.test texinfo5.test texinfo6.test texinfo7.test unused.test version.test version2.test version3.test vpath.test vtexi.test vtexi2.test whoami.test xsource.test yacc.test yaccpp.test
 
 
 EXTRA_DIST = defs $(TESTS)
@@ -158,7 +158,7 @@ uninstall: uninstall-am
 all-am: Makefile
 all-redirect: all-am
 install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+       $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs: