From 321554c2cad95de7e163ac0e43e906bc50fb6b26 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 2 Mar 1996 22:02:41 +0000 Subject: [PATCH] Bug fixes --- ChangeLog | 6 ++++++ Makefile.in | 3 --- THANKS | 1 + TODO | 14 -------------- automake.in | 28 ++++++++++++++++++---------- automake.texi | 8 ++++++++ version.texi | 2 +- 7 files changed, 34 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 991e2ea3..2893e713 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Mar 2 14:04:38 1996 Tom Tromey + + * automake.in (handle_dist_worker): Only cause Automake to be + re-run if not making a distribution. Fixes bug reported by + Joerg-Martin Schwarz. + Fri Mar 1 00:13:04 1996 Tom Tromey * automake.in (parse_arguments): Default strictness is gnu. diff --git a/Makefile.in b/Makefile.in index 3bf4a1d0..d6472315 100644 --- a/Makefile.in +++ b/Makefile.in @@ -261,9 +261,6 @@ dist: $(DEP_DISTFILES) rm -rf $(distdir) mkdir $(distdir) chmod 777 $(distdir) - distdir=`cd $(distdir) && pwd` \ - && cd $(srcdir) \ - && automake --include-deps --output-dir=$$distdir --strictness=gnits @for file in `cd $(srcdir) && echo $(DISTFILES)`; do \ test -f $(distdir)/$$file \ || ln $(srcdir)/$$file $(distdir)/$$file 2> /dev/null \ diff --git a/THANKS b/THANKS index e70c1b92..5bce45e9 100644 --- a/THANKS +++ b/THANKS @@ -9,5 +9,6 @@ Henrik Frystyk Nielsen Jerome Santini Jim Meyering Karl Berry +Markku Rossi Noah Friedman Ulrich Drepper diff --git a/TODO b/TODO index 1bcfbd5e..db8959e3 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,6 @@ Priorities for release: * Check all require_file errors to see if any should reference a line in Makefile.am or configure.in. [handle_configure does] -* Error if program name not acceptable as makefile variable name * Add prog_CFLAGS Franc,ois> * Do you speak somewhere of the capability Automake has to let @@ -25,21 +24,12 @@ Other priorities: * Rewrite clean targets. * Expand test suite. ->>>>> "JMS" == Joerg-Martin Schwarz writes: -JMS> make dist requires that automake be installed, even if the -JMS> current Makefile.in already includes all dependency files. This -JMS> way one cannot re-create the tar file from the extracted source -JMS> file tree. - Consider allowing mkinstalldirs, mdate-sh, and others to be put in AC_CONFIG_AUX_DIR. Maybe even ansi2knr? Testing: allow support for Cygnus-style dejagnu-based test suites via an option -when in subdir that itself has subdirs, might need to do -include-by-reference TAGS file. - Think about ways to make automake fit better with Cygnus-style trees. Use recode in dist target when MAIN_CHARSET specified. Read caveats @@ -138,8 +128,6 @@ I agree, but I don't see how to implement this yet. It might be easier if "derived files" is limited to those that Automake itself knows about, eg output of yacc. -Should COPYING.LIB be distributed? - Check all source files to make sure that FSF address is up-to-date. --gnits or --gnu only. @@ -170,8 +158,6 @@ Should handle directory hierarchies deeper than 2. Right now there is some support for this. Here are some of the issues: * Should handle AC_CONFIG_SUBDIRS, ie must handle configure.in in subdirs * Must handle SUBDIRS in subdir Makefile.am's -* Must handle AC_CONFIG_AUX_DIR - * FIXME must already look in .. and ../.. ================================================================ diff --git a/automake.in b/automake.in index 85a6ac85..abb4b669 100755 --- a/automake.in +++ b/automake.in @@ -973,20 +973,28 @@ sub handle_dist_worker $output_rules .= - ( - # Create dist directory. - ' rm -rf $(distdir) + # Create dist directory. + ' rm -rf $(distdir) mkdir $(distdir) chmod 777 $(distdir) -' - # We need an absolute path for --output-dir. Thus the - # weirdness. - . ' distdir=`cd $(distdir) && pwd` \\ +'; + + # Only run automake in `dist' target if --include-deps not + # specified. That way the recipient of a distribution can run + # "make dist" and not need Automake. + if ($cmdline_use_dependencies) + { + $output_rules .= + ( + # We need an absolute path for --output-dir. Thus the + # weirdness. + ' distdir=`cd $(distdir) && pwd` \\ && cd $(srcdir) \\ && automake --include-deps --output-dir=$$distdir --strictness=' - # Set strictness of output. - . $strictness_name . "\n" - ); + # Set strictness of output. + . $strictness_name . "\n" + ); + } } # In loop, test for file existence because sometimes a file gets diff --git a/automake.texi b/automake.texi index bbd5ce35..0c9931a3 100644 --- a/automake.texi +++ b/automake.texi @@ -338,6 +338,14 @@ end, Automake allows you to extend the list of possible installation directories. A given prefix (eg @samp{zar}) is valid if a variable of the same name with @samp{dir} appended is defined (eg @samp{zardir}). +For instance, until HTML support is part of Automake, you could use this +to install raw HTML documentation: + +@example +htmldir = $(prefix)/html +html_DATA = automake.html +@end example + The special prefix @samp{noinst} indicates that the objects in question should not be installed at all. diff --git a/version.texi b/version.texi index 566c8d36..796c3690 100644 --- a/version.texi +++ b/version.texi @@ -1,3 +1,3 @@ -@set UPDATED 1 March 1996 +@set UPDATED 2 March 1996 @set EDITION 0.31 @set VERSION 0.31 -- 2.43.5