Fixes from Franc,ois

diff --git a/ChangeLog b/ChangeLog
index 92115b3ce623adbe2e58054c11946392f7b7efe6..331baf8b5513da8a51575c8136119afa1f31bd47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Sun Jan 14 13:54:16 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       Changes from François Pinard:
+       * texinfos.am (install-info): Correctly install when build dir is
+       not srcdir.
+       * tags-subd.am (ID): Indentation change.
+       * kr-vars.am (o): Use ".@U@o", not "@U@o".
+       * depend.am ($(srcdir)/.deps/%.P): Remove temporary file.
+       * automake.in (handle_dist_worker): Fixlets.
+       (handle_dist): Sort keys going into dist_common.
+
 Sat Jan 13 00:18:06 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * automake.in (handle_dist_worker): If Gnits, don't allow release

diff --git a/TODO b/TODO
index 6ab10301aa85e71d57f3c43cfce6c6f71b883bfe..d4f62adff5097bde73580bbbd797617e4b219072 100644 (file)
--- a/TODO
+++ b/TODO
@@ -27,10 +27,6 @@ Clean up the output:
   and backslash should be the rule.  Update makefile-mode to allow this.
   (set column to 0, probably)
 
-Look in configure to see what goes in LIBOBJS.  Recognize all automake
-macros that do this.  And look for:
-       LIBOBJS="x.o $LIBOBJS y.o"
-
 Need OTHER_SOURCES to hold sources whose objects end up in eg LIBOBJS.
 Dependency tracking should work here.  Maybe if it doesn't exist it
 should be generated automatically by scanning the directory.  (yes)

diff --git a/automake.in b/automake.in
index ca8374422aa810fb581cf8de2aff91753263b0c1..cd8fa5528c6937d8e333dd9f16cf9efe773ab8f7 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -683,7 +683,7 @@ sub handle_dist_worker
     local ($target) = $distshar ? 'dist-shar' : 'dist';
 
     $output_rules .= $target . ': $(DEP_DISTFILES)' . "\n";
-    
+
     # Initialization; only at top level.
     if ($relative_dir eq '.')
     {
@@ -752,7 +752,7 @@ sub handle_dist_worker
     {
        $output_rules .= '      @for dir in $(DIST_SUBDIRS); do         \\
          echo copying directory $$dir;         \\
-         tar -chf - $$dir | (cd $(distdir) && tar -xBpf -); \\
+         tar chf - $$dir | (cd $(distdir) && tar xBpf -); \\
        done
 ';
     }
@@ -767,7 +767,7 @@ sub handle_dist_worker
        }
        else
        {
-           $output_rules .= 'tar -chozf $(distdir).tar.gz $(distdir)';
+           $output_rules .= 'tar chozf $(distdir).tar.gz $(distdir)';
        }
        $output_rules .= "\n\t" . 'rm -rf $(distdir)' . "\n";
     }
@@ -798,7 +798,7 @@ sub handle_dist
        push (@coms, 'README');
        undef $dist_common{'README'};
     }
-    push (@coms, keys %dist_common);
+    push (@coms, sort keys %dist_common);
 
     &pretty_print ("DIST_COMMON =", '', @coms);
     $output_vars .= "\n";

diff --git a/depend.am b/depend.am
index 65372361753ff6009c77814d745bbc43b39b5ed6..c596cc321d9766d06a60515c913808e9c02c8cde 100644 (file)
--- a/depend.am
+++ b/depend.am
@@ -43,6 +43,7 @@ $(srcdir)/.deps/%.P: $(srcdir)/%.c
          $(MKDEP) $< | sed $$re > $@-tmp
        @if test -n "$o"; then                  \
          sed 's/\.o:/$$o:/' $@-tmp > $@;       \
+         rm $@-tmp;                            \
        else                                    \
          mv $@-tmp $@;                         \
        fi

diff --git a/kr-vars.am b/kr-vars.am
index 2714d7d253cfd1320df53a4f4d17c3c253287398..2102715764faa793ac0d4de8b2e374306e417ad1 100644 (file)
--- a/kr-vars.am
+++ b/kr-vars.am
@@ -16,4 +16,4 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 ANSI2KNR = @ANSI2KNR@
-o = @U@o
+o = .@U@o

diff --git a/lib/am/depend.am b/lib/am/depend.am
index 65372361753ff6009c77814d745bbc43b39b5ed6..c596cc321d9766d06a60515c913808e9c02c8cde 100644 (file)
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -43,6 +43,7 @@ $(srcdir)/.deps/%.P: $(srcdir)/%.c
          $(MKDEP) $< | sed $$re > $@-tmp
        @if test -n "$o"; then                  \
          sed 's/\.o:/$$o:/' $@-tmp > $@;       \
+         rm $@-tmp;                            \
        else                                    \
          mv $@-tmp $@;                         \
        fi

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 714ed6268197b9d47c5b93c2b8a84730cc7b1a0a..d67aef7bd7c82f4ce9dbe7d3c2b3f06a205cac2c 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -27,8 +27,10 @@
 install-info: $(INFO_DEPS)
        $(top_srcdir)/mkinstalldirs $(infodir)
        for file in $(INFO_DEPS); do            \
-## This ${...} is in the shell, not in make.
-         for ifile in $(srcdir)/$${file}*; do  \
+## This ${...} is in the shell, not in make.  We use these strange
+## circumlocutions because we want the "ifile" to be relative, for the
+## install.
+         for ifile in `cd $(srcdir) && echo $${file}*`; do \
            $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
          done;                                 \
 ## We need the 'else' because in some broken versions of sh 'if' will

diff --git a/tags-subd.am b/tags-subd.am
index 75fc4a667a70afd164370fb33f3f6a2559042c0b..738d59f9e347e4ad324e95567b8b4deea64eeb0c 100644 (file)
--- a/tags-subd.am
+++ b/tags-subd.am
@@ -15,7 +15,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-ID:    $(HEADERS) $(SOURCES)
+ID: $(HEADERS) $(SOURCES)
        here=`pwd` && cd $(srcdir) && mkid -f $$here/ID $(SOURCES) $(HEADERS)
 
 tags: TAGS

diff --git a/texinfos.am b/texinfos.am
index 714ed6268197b9d47c5b93c2b8a84730cc7b1a0a..d67aef7bd7c82f4ce9dbe7d3c2b3f06a205cac2c 100644 (file)
--- a/texinfos.am
+++ b/texinfos.am
@@ -27,8 +27,10 @@
 install-info: $(INFO_DEPS)
        $(top_srcdir)/mkinstalldirs $(infodir)
        for file in $(INFO_DEPS); do            \
-## This ${...} is in the shell, not in make.
-         for ifile in $(srcdir)/$${file}*; do  \
+## This ${...} is in the shell, not in make.  We use these strange
+## circumlocutions because we want the "ifile" to be relative, for the
+## install.
+         for ifile in `cd $(srcdir) && echo $${file}*`; do \
            $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
          done;                                 \
 ## We need the 'else' because in some broken versions of sh 'if' will