From 29d81523c3a9f5011051fa9a71f85d8466c0c689 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 14 Jan 1996 23:48:39 +0000 Subject: [PATCH] Fixes from Franc,ois --- ChangeLog | 11 +++++++++++ TODO | 4 ---- automake.in | 8 ++++---- depend.am | 1 + kr-vars.am | 2 +- lib/am/depend.am | 1 + lib/am/texinfos.am | 6 ++++-- tags-subd.am | 2 +- texinfos.am | 6 ++++-- 9 files changed, 27 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92115b3c..331baf8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Sun Jan 14 13:54:16 1996 Tom Tromey + + 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 * automake.in (handle_dist_worker): If Gnits, don't allow release diff --git a/TODO b/TODO index 6ab10301..d4f62adf 100644 --- 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 ca837442..cd8fa552 100755 --- 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 65372361..c596cc32 100644 --- 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 2714d7d2..21027157 100644 --- 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 65372361..c596cc32 100644 --- 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 714ed626..d67aef7b 100644 --- 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 75fc4a66..738d59f9 100644 --- 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 714ed626..d67aef7b 100644 --- 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 -- 2.43.5