From efe8b3e87e6d1ec12504e06a50aefd5b62bcfc94 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 24 Mar 1997 20:39:12 +0000 Subject: [PATCH] netbsd fix --- ChangeLog | 5 +++++ TODO | 29 ++++++++--------------------- header-vars.am | 6 ++++++ lib/am/header-vars.am | 6 ++++++ tests/Makefile.in | 4 ++-- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index deaadda2..d17fae4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Mar 24 23:28:59 1997 Tom Tromey + + * header-vars.am (NORMAL_INSTALL, PRE_INSTALL, POST_INSTALL): + Define. + Sat Mar 22 00:06:00 1997 Tom Tromey * automake.in (am_install_var): Make sure to delete diff --git a/TODO b/TODO index 6edc8daa..6ee7dcf8 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,9 @@ Priorities for release: * copyrights on m4 files, aclocal output +* if no AM_INIT_AUTOMAKE, then don't handle `missing' stuff. + Yuck! + * should not put texiname_TEXINFOS into distribution should rename this macro anyway, to foo_texi_DEPENDENCIES @@ -26,9 +29,6 @@ non-C source in a libtool library specification. strictness should only cover requirements You should be able to pick and choose options -* cygwin32 support: add .exe to all executables; discover cygwin32 - without using ac_canonical_*. - should clean up texinfos.am; one rule is repeated 3 times, but shouldn't be @@ -47,12 +47,6 @@ rewrite in guile * consider adding pkglibexecdir, maybe others? requests for pkg-dirs with version included -Fix ansi2knr so that knr-style function decls aren't incorrectly -rewritten. Or, fix automake so that not all sources in a directory -must be ansi. Should also fix things so that a separate ._o file is -not needed; instead use a wrapper script. - - Further: - man page fixes @@ -115,9 +109,6 @@ From Jason Molenda: Jim's idea: should look for @setfilename and warn if filenames too long * guess split size -* allow ".info" to be missing - -* must update GNU Hello ** many requests for a way to omit a file from the distribution. Should be done like `!foo' or `~foo' in _SOURCES, etc. @@ -312,15 +303,6 @@ together and rules are in the usual order. Make the output minimal: only output definitions for variables that are used. -Look at dist's jmake for ideas. dist is the name of the distribution -including Metaconfig. Perl uses it. - -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 - * can do this by looking at subdirs, seeing configure.in - and auto-running Automake there - djm says: David> To avoid comments like the one about subdirs getting buried in David> the middle of a Makefile.in, how about pushing comments that @@ -343,6 +325,11 @@ containing application. Document: +how to use the generated makefiles + - standard targets + - required targets + - NORMAL_INSTALL junk + what goes in AC_CONFIG_AUX_DIR TEXINFO_TEX diff --git a/header-vars.am b/header-vars.am index 24364813..dae6fc1e 100644 --- a/header-vars.am +++ b/header-vars.am @@ -54,3 +54,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ + +## These are defined because otherwise make on NetBSD V1.1 will print +## (eg): $(NORMAL_INSTALL) expands to empty string. +NORMAL_INSTALL = @: +PRE_INSTALL = @: +POST_INSTALL = @: diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index 24364813..dae6fc1e 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -54,3 +54,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ + +## These are defined because otherwise make on NetBSD V1.1 will print +## (eg): $(NORMAL_INSTALL) expands to empty string. +NORMAL_INSTALL = @: +PRE_INSTALL = @: +POST_INSTALL = @: diff --git a/tests/Makefile.in b/tests/Makefile.in index 19b78a32..3dcc0ae6 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -71,8 +71,8 @@ distdir.test lex2.test libobj4.test libobj5.test version.test \ ranlib.test confvar.test confvar2.test stdlib.test cxxo.test \ colon2.test colon3.test remake.test output.test output2.test \ remake2.test output3.test output4.test colneq2.test subst.test \ -defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test \ -cxxlibobj.test seenc.test +defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test \ +cxxlibobj.test seenc.test cygwin32.test EXTRA_DIST = defs $(TESTS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -- 2.43.5