diff options
| author | wl <wl> | 2006-01-03 23:57:03 +0000 |
|---|---|---|
| committer | wl <wl> | 2006-01-03 23:57:03 +0000 |
| commit | d934ff6d9368d954c0b532cd4c23f4d4c3591cce (patch) | |
| tree | 0d41502d8780d600bc3ff86604bf05f6d2312c86 /Makefile.sub | |
| parent | 1768e1210ff633038445e4eafb3027d53712c2b4 (diff) | |
| download | groff-d934ff6d9368d954c0b532cd4c23f4d4c3591cce.tar.gz | |
* m4/groff.m4: Renamed from aclocal.m4.
* m4/codeset.m4: New file, from gnulib.
* m4/iconv.m4: New file, from gnulib.
* m4/lib-ld.m4, m4/lib-link.m4, m4/lib-prefix.m4: New files, from
gnulib.
* config.rpath: New file, from gnulib.
* config.guess, config.sub: New files, from gnulib.
* Makefile.sub (M4MACROS): New variable.
(configure): Fix typo.
(aclocal.m4): New rule.
(stamp-h.in): Depend on aclocal.m4.
* configure.ac: Invoke AM_ICONV and AM_LANGINFO_CODESET.
* Makefile.in (LIBICONV): New variable.
(MDEFINES): Pass it to recursive makes.
* src/preproc/preconv/preconv.cpp: Use HAVE_LANGINFO_CODESET and
HAVE_ICONV instead of I18N macro.
* src/preproc/preconv/Makefile.sub (EXTRA_LDFLAGS): New variable.
* aclocal.m4, configure, src/include/config.hin: (Re)generated.
* doc/Makefile.in (webpage.html): Simplify.
* doc/Makefile.sub (webpage.html): Synchronize with doc/Makefile.in.
* doc/webpage.ms, tmac/groff_www.man, tmac/www.tmac: Minor updates.
Diffstat (limited to 'Makefile.sub')
| -rw-r--r-- | Makefile.sub | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Makefile.sub b/Makefile.sub index 26523630..26dfda11 100644 --- a/Makefile.sub +++ b/Makefile.sub @@ -12,17 +12,26 @@ DISTCLEANFILES=\ groff.log CLEANADD=Makefile.cfg conftest* +M4MACROS = \ + $(srcdir)/m4/groff.m4 \ + $(srcdir)/m4/codeset.m4 \ + $(srcdir)/m4/iconv.m4 \ + $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-ld.m4 $(srcdir)/m4/lib-prefix.m4 + distfiles: configure -$(scrdir)/configure: configure.ac aclocal.m4 +$(srcdir)/configure: configure.ac $(srcdir)/aclocal.m4 cd $(srcdir) && autoconf +$(srcdir)/aclocal.m4: $(M4MACROS) + cd $(srcdir) && aclocal -I m4 + config.status: configure $(SHELL) config.status --recheck # autoheader might not change config.hin, so touch a stamp file. $(srcdir)/config.hin: stamp-h.in -$(srcdir)/stamp-h.in: configure.ac aclocal.m4 +$(srcdir)/stamp-h.in: configure.ac $(srcdir)/aclocal.m4 cd $(srcdir) && autoheader echo timestamp > $(srcdir)/stamp-h.in |