Even more bug fixes

diff --git a/ChangeLog b/ChangeLog
index 7df44b601e7452391c26c7675ead9cbb674153ca..5037848def22e33790fb5ff83295080af30fc4fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,23 @@
 Sun Aug  4 12:52:43 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       * automake.in (handle_dist_worker): Use fgrep, not grep.
+
+       * m4/AM_C_PROTOTYPES.m4: Changes from François Pinard.
+
+       * automake.in (handle_emacs_lisp): Include lisp-clean.am in
+       output.
+       (initialize_global_constants): [install_man_format] Don't hide
+       "ugliness" at install time.
+
+       * lisp-clean.am: New file.
+
+       * tags-clean.am (maintainer-clean-tags): Remove TAGS and ID here.
+
        * automake.in (handle_man_pages): Patch from Janos Farkas to fix
        bug when installing man pages.  Test man.test.
        (initialize_global_constants): [install_man_format] Make sure man
        page can actually be found in either source or build dirs.
+       (handle_dist_worker): Use "755" permissions on distdir.
 
        * automake.in (handle_dist): Allow chmod's to fail.
        (am_primary_prefixes): New function.

diff --git a/Makefile.am b/Makefile.am
index 24cd40b2ce2e6e1384da77c37ef5616109fa825e..23a695a19149313bc14ea0b601ba1a159a5db859 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@ mans-vars.am program.am programs.am remake-hdr.am remake-subd.am \
 remake.am scripts.am subdirs.am tags.am tags-subd.am tags-clean.am \
 texi-version.am texinfos-vars.am texinfos.am libraries-clean.am \
 programs-clean.am data-clean.am COPYING INSTALL texinfo.tex ansi2knr.c \
-ansi2knr.1 aclocal.m4 lisp.am
+ansi2knr.1 aclocal.m4 lisp.am lisp-clean.am
 
 ## These must all be executable when installed.
 pkgdata_SCRIPTS = config.guess config.sub install-sh mdate-sh \

diff --git a/Makefile.in b/Makefile.in
index f33aae8ea00349dd688df3ae619a784128a4e725..e712ba672809cfffea7597d71aa7e02f965fddf6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,7 +56,7 @@ mans-vars.am program.am programs.am remake-hdr.am remake-subd.am \
 remake.am scripts.am subdirs.am tags.am tags-subd.am tags-clean.am \
 texi-version.am texinfos-vars.am texinfos.am libraries-clean.am \
 programs-clean.am data-clean.am COPYING INSTALL texinfo.tex ansi2knr.c \
-ansi2knr.1 aclocal.m4 lisp.am
+ansi2knr.1 aclocal.m4 lisp.am lisp-clean.am
 
 pkgdata_SCRIPTS = config.guess config.sub install-sh mdate-sh \
 mkinstalldirs elisp-comp
@@ -82,9 +82,9 @@ TEXINFOS = automake.texi
 DATA = $(pkgdata_DATA)
 
 DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS README THANKS TODO aclocal.in aclocal.m4 automake.in \
-config.guess config.sub configure configure.in install-sh mdate-sh \
-mkinstalldirs stamp-vti texinfo.tex version.texi
+Makefile.in NEWS README THANKS TODO aclocal.in aclocal.m4 ansi2knr.1 \
+ansi2knr.c automake.in config.guess config.sub configure configure.in \
+install-sh mdate-sh mkinstalldirs stamp-vti texinfo.tex version.texi
 
 
 PACKAGE = @PACKAGE@
@@ -238,7 +238,6 @@ mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
        for subdir in $(SUBDIRS); do            \
          target=`echo $@ | sed s/-recursive//`; \
-         echo making $$target in $$subdir;     \
          (cd $$subdir && $(MAKE) $$target)     \
           || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
        done && test -z "$$fail"
@@ -294,7 +293,7 @@ distcheck: dist
        echo "$(distdir).tar.gz is ready for distribution"; \
        echo "========================"
 dist: distdir
-       chmod -R a+r $(distdir)
+       -chmod -R a+r $(distdir)
        $(TAR) chozf $(distdir).tar.gz $(distdir)
        rm -rf $(distdir)
 distdir: $(DEP_DISTFILES)

diff --git a/TODO b/TODO
index dbc507fb97c6d47e445ac095b0d443316da648fb..69095adbef16ff03108bb9ba3ebb6b76a7512374 100644 (file)
--- a/TODO
+++ b/TODO
@@ -260,6 +260,15 @@ David> start with ### to the top of the Makefile.in (in order)?  Sort
 David> of like how Autoconf uses diversions to force initialization
 David> code to the top of configure.
 
+Janos Farkas says:
+ suidbins = su
+ suidubins = chage cfhn etc etc
+ noinst_PROGRAMS = grpconv pwconv id groups $(suidbins) $(suidubins)
+... should work.
+
+Karl Berry says:
+Karl> 2) Your Makefile variable names are generally uppercase, but GNU
+Karl> generally uses lowercase. Not that it matters :-).
 
 ================================================================
 

diff --git a/automake.in b/automake.in
index d25592b800c7df53a988bac56af07113a34c589d..e57795d57e0f0bd1d0bdbe2409182207658c9f5c 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1161,7 +1161,7 @@ sub handle_dist_worker
        {
            # For Gnits users, this is pretty handy.  Look at 15 lines
            # in case some explanatory text is desirable.
-           $output_rules .= '  @if sed 15q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \\
+           $output_rules .= '  @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \\
          echo "NEWS not updated; not releasing" 1>&2; \\
          exit 1;                               \\
        fi
@@ -1173,7 +1173,7 @@ sub handle_dist_worker
            # Create dist directory.
            '   rm -rf $(distdir)
        mkdir $(distdir)
-       chmod 777 $(distdir)
+       -chmod 755 $(distdir)
 ';
 
        # Only run automake in `dist' target if --include-deps not
@@ -1223,7 +1223,7 @@ sub handle_dist_worker
          test -d $(distdir)/$$subdir           \\
          || mkdir $(distdir)/$$subdir          \\
          || exit 1;                            \\
-         chmod 777 $(distdir)/$$subdir;        \\
+         -chmod 755 $(distdir)/$$subdir;       \\
          (cd $$subdir && $(MAKE) distdir=../$(distdir)/$$subdir distdir) \\
            || exit 1; \\
        done
@@ -2093,6 +2093,9 @@ sub handle_emacs_lisp
        grep ($_ .= 'c', @elfiles);
        &pretty_print ('ELCFILES =', '', @elfiles);
 
+       push (@clean, 'lisp');
+       &push_phony_cleaners ('lisp');
+
        local ($varname);
        if (&variable_defined ('lisp_LISP'))
        {
@@ -2104,8 +2107,8 @@ sub handle_emacs_lisp
        {
            $varname = 'noinst_LISP';
        }
-       &require_file_with_line ($varname, $FOREIGN, 'elisp-comp');
 
+       &require_file_with_line ($varname, $FOREIGN, 'elisp-comp');
     }
 }
 
@@ -2611,9 +2614,8 @@ sub initialize_global_constants
 
     # Helper text for dealing with man pages.
     $install_man_format =
-    '  @sect=@SECTION@;                                \\
+    '  sect=@SECTION@;                         \\
        inst=`echo "@MANBASE@" | sed \'$(transform)\'`.@FULLSECT@; \\
-       echo installing @MAN@ as $(mandir)/man$$sect/$$inst; \\
        if test -f $(srcdir)/@MAN@; then file=$(srcdir)/@MAN@; \\
        else file=@MAN@; fi; \\
        $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 24cd40b2ce2e6e1384da77c37ef5616109fa825e..23a695a19149313bc14ea0b601ba1a159a5db859 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -18,7 +18,7 @@ mans-vars.am program.am programs.am remake-hdr.am remake-subd.am \
 remake.am scripts.am subdirs.am tags.am tags-subd.am tags-clean.am \
 texi-version.am texinfos-vars.am texinfos.am libraries-clean.am \
 programs-clean.am data-clean.am COPYING INSTALL texinfo.tex ansi2knr.c \
-ansi2knr.1 aclocal.m4 lisp.am
+ansi2knr.1 aclocal.m4 lisp.am lisp-clean.am
 
 ## These must all be executable when installed.
 pkgdata_SCRIPTS = config.guess config.sub install-sh mdate-sh \

diff --git a/lisp-clean.am b/lisp-clean.am
new file mode 100644 (file)
index 0000000..94bbcd4
--- /dev/null
+++ b/lisp-clean.am
@@ -0,0 +1,25 @@
+## automake - create Makefile.in from Makefile.am
+## Copyright (C) 1996 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.
+mostlyclean-lisp:
+
+clean-lisp:
+       test -z "$(ELCFILES)" || rm -f $(ELCFILES)
+
+distclean-lisp:
+
+maintainer-clean-lisp:

diff --git a/m4/AM_C_PROTOTYPES.m4 b/m4/AM_C_PROTOTYPES.m4
index 0d8961f5d4068ee00c1066101da3b067fa4be75b..549b97435ee2dad2d66379c7b74d661193181c06 100644 (file)
--- a/m4/AM_C_PROTOTYPES.m4
+++ b/m4/AM_C_PROTOTYPES.m4
@@ -5,6 +5,7 @@
 
 AC_DEFUN(AM_C_PROTOTYPES,
 [AC_REQUIRE([AM_PROG_CC_STDC])
+AC_BEFORE([$0], [AC_C_INLINE])
 AC_MSG_CHECKING([for function prototypes])
 if test "$ac_cv_prog_cc_stdc" != no; then
   AC_MSG_RESULT(yes)
@@ -13,6 +14,9 @@ if test "$ac_cv_prog_cc_stdc" != no; then
 else
   AC_MSG_RESULT(no)
   U=_ ANSI2KNR=./ansi2knr
+  # Ensure some checks needed by ansi2knr itself.
+  AC_HEADER_STDC
+  AC_CHECK_HEADERS(string.h)
 fi
 AC_SUBST(U)dnl
 AC_SUBST(ANSI2KNR)dnl

diff --git a/tags-clean.am b/tags-clean.am
index 781ae5685097cc0190a3fd2888f80969d0c690ae..2a52b33911f0340dcd6c6b24c05b73c3632abe68 100644 (file)
--- a/tags-clean.am
+++ b/tags-clean.am
@@ -20,6 +20,7 @@ mostlyclean-tags:
 clean-tags:
 
 distclean-tags:
-       rm -f TAGS ID
 
+## The GNU Standards mandates that tags files be removed here.
 maintainer-clean-tags:
+       rm -f TAGS ID