[groff] 20/33: tmac files installation

[Bertrand Garrigues]

bgarrigues pushed a commit to branch automake2
in repository groff.

commit d76fe93b0bdabd85aaad7b0972147b2318062252
Author: Bertrand Garrigues <address@hidden>
Date:   Sat Sep 6 01:38:23 2014 +0200

    tmac files installation
---
 Makefile.am                           |    1 +
 TESTS                                 |   18 +++-
 tmac/Makefile.sub                     |  169 ----------------------------
 tmac/{doc-common => doc-common-u}     |    0
 tmac/{doc-ditroff => doc-ditroff-u}   |    0
 tmac/{doc-nroff => doc-nroff-u}       |    0
 tmac/{doc-old.tmac => doc-old.tmac-u} |    0
 tmac/{doc-syms => doc-syms-u}         |    0
 tmac/{doc.tmac => doc.tmac-u}         |    0
 tmac/{e.tmac => e.tmac-u}             |    0
 tmac/tmac.am                          |  197 +++++++++++++++++++++++++++++++++
 tmac/{www.tmac => www.tmac.in}        |    0
 12 files changed, 215 insertions(+), 170 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5d71af6..c25dcb3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -571,6 +571,7 @@ include $(top_srcdir)/src/utils/lookbib/lookbib.am
 include $(top_srcdir)/src/utils/pfbtops/pfbtops.am
 include $(top_srcdir)/src/utils/tfmtodit/tfmtodit.am
 include $(top_srcdir)/src/utils/xtotroff/xtotroff.am
+include $(top_srcdir)/tmac/tmac.am
 
 # Adding defs.h to BUILT_SOURCES will ensure that it will be built on
 # make all or make check before all other targets. However, if another
diff --git a/TESTS b/TESTS
index deee8fc..97ce1c0 100644
--- a/TESTS
+++ b/TESTS
@@ -18,6 +18,8 @@ Current status
   - Build src/devices/*
   - Build src/roff/*
   - Build font/*
+  - man files from 'man' directory installed
+  - tmac files from 'tmac' directory installed
 
 Tests
 -----
@@ -131,7 +133,6 @@ from font: font files in
   - devps
   - devutf8
 
-
 In order to check and improve the dependencies, the following targets
 were built from a clean environment:
   - make lib/libgnu.a
@@ -254,9 +255,23 @@ Differences with former build system:
     build system, except the fonts from devpdf which are not generated
     identically at each build.
 
+  - tmac files from 'tmac' dir are installed in
+    $(DESTDIR)/usr/local/groff/1.22.2/tmac. Some files are first
+    stripped (comments removed) at build time. Checked that they are
+    strictly identical to the one install by the original build
+    system.
+
 Diff with previous build system:
   - devcp1047 fonts are installed $(DESTDIR)/usr/local/groff/1.22.2/font
 
+TODO: 
+
+  - The original build system might uses tmac_s_prefix,
+  tmac_an_prefix, tmac_wrap and sys_tmac_prefix during the
+  installation of some tmac files but set these variables to an empty
+  value in tmac/Makefile.sub, I don't quite understand how these
+  variables could be set.
+
 2.7 make uninstall
 
   Removes:
@@ -269,6 +284,7 @@ Diff with previous build system:
   - $(DESTDIR)/usr/local/share/groff/1.22/
   - $(DESTDIR)/usr/local/share/groff/1.22/font
   - $(DESTDIR)/usr/local/share/groff/1.22/oldfont
+  - $(DESTDIR)/usr/local/share/groff/1.22/tmac
   - $(DESTDIR)/usr/local/share/groff/
   - $(DESTDIR)/usr/X11/lib/X11/app-defaults/GXditview and
     GXditview-color. However, GXditview.old and GXditview-color.old
diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
deleted file mode 100644
index 19877eb..0000000
--- a/tmac/Makefile.sub
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright (C) 1989-2007, 2009-2012, 2014
-#   Free Software Foundation, Inc.
-#      Written by James Clark (address@hidden)
-#
-# This file is part of groff.
-#
-# groff is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# groff is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-MAN7=\
-  groff_ms.n \
-  groff_man.n \
-  groff_me.n \
-  groff_mdoc.n \
-  groff_trace.n \
-  groff_www.n
-
-NORMALFILES=\
-  man.tmac mandoc.tmac andoc.tmac an-old.tmac an-ext.tmac \
-  ms.tmac \
-  me.tmac \
-  mdoc.tmac \
-  pic.tmac \
-  a4.tmac papersize.tmac \
-  62bit.tmac \
-  ec.tmac \
-  safer.tmac \
-  trace.tmac \
-  ps.tmac psold.tmac pspic.tmac psatk.tmac \
-  pdf.tmac \
-  dvi.tmac \
-  tty.tmac tty-char.tmac \
-  latin1.tmac latin2.tmac latin5.tmac latin9.tmac cp1047.tmac \
-  unicode.tmac \
-  X.tmac Xps.tmac \
-  lj4.tmac \
-  lbp.tmac \
-  html.tmac html-end.tmac \
-  devtag.tmac \
-  europs.tmac \
-  composite.tmac fallbacks.tmac \
-  eqnrc \
-  refer.tmac refer-me.tmac refer-ms.tmac \
-  troffrc troffrc-end \
-  trans.tmac \
-  hyphen.us hyphenex.us \
-  fr.tmac hyphen.fr \
-  sv.tmac hyphen.sv \
-  de.tmac den.tmac hyphen.det hyphen.den hyphenex.det \
-  cs.tmac hyphen.cs hyphenex.cs \
-  ja.tmac
-
-# These files are handled specially during installation and deinstallation.
-SPECIALFILES=an.tmac s.tmac www.tmac
-
-# These files are processed with `strip.sed'.
-STRIPFILES=e.tmac doc.tmac doc-old.tmac
-MDOCFILES=doc-common doc-ditroff doc-nroff doc-syms
-mdocdir=$(tmacdir)/mdoc
-
-MOSTLYCLEANADD=\
-  stamp-wrap stamp-sed *-wrap www.tmac-sed \
-  stamp-strip e.tmac-s doc.tmac-s doc-old.tmac-s \
-  doc-common-s doc-ditroff-s doc-nroff-s doc-syms-s mdoc.local-s
-tmac_s_prefix=
-tmac_an_prefix=
-tmac_wrap=
-sys_tmac_prefix=
-pnmtops_nosetpage="pnmtops"
-
-all: stamp-strip stamp-wrap stamp-sed
-
-install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
-              stamp-strip stamp-wrap stamp-sed
-       -test -d $(DESTDIR)$(tmacdir) \
-         || $(mkinstalldirs) $(DESTDIR)$(tmacdir)
-       -test -d $(DESTDIR)$(systemtmacdir) \
-         || $(mkinstalldirs) $(DESTDIR)$(systemtmacdir)
-       -test -d $(DESTDIR)$(localtmacdir) \
-         || $(mkinstalldirs) $(DESTDIR)$(localtmacdir)
-       if test -n "$(tmac_wrap)"; then \
-         for m in ""$(tmac_wrap); do \
-           $(INSTALL_DATA) $$m-wrap $(DESTDIR)$(systemtmacdir)/$$m.tmac; \
-         done; \
-       fi
-       for f in $(NORMALFILES); do \
-         rm -f $(DESTDIR)$(tmacdir)/$$f; \
-         $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f; \
-       done
-       rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
-       $(INSTALL_DATA) $(srcdir)/s.tmac \
-         $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
-       rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
-       $(INSTALL_DATA) $(srcdir)/an.tmac \
-         $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
-       rm -f $(DESTDIR)$(tmacdir)/www.tmac
-       $(INSTALL_DATA) www.tmac-sed $(DESTDIR)$(tmacdir)/www.tmac
-       for f in $(STRIPFILES); do \
-         rm -f $(DESTDIR)$(tmacdir)/$$f; \
-         $(INSTALL_DATA) $$f-s $(DESTDIR)$(tmacdir)/$$f; \
-       done
-       -test -d $(DESTDIR)$(mdocdir) || $(mkinstalldirs) $(DESTDIR)$(mdocdir)
-       for f in $(MDOCFILES); do \
-         rm -f $(DESTDIR)$(mdocdir)/$$f; \
-         $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \
-       done
-       -test -f $(DESTDIR)$(localtmacdir)/man.local \
-         || $(INSTALL_DATA) $(srcdir)/man.local \
-              $(DESTDIR)$(localtmacdir)/man.local
-       -test -f $(DESTDIR)$(localtmacdir)/mdoc.local \
-         || $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
-
-stamp-strip: $(STRIPFILES) $(MDOCFILES) mdoc.local
-       for f in $(STRIPFILES) $(MDOCFILES) mdoc.local; do \
-         rm -f $$f-s; \
-         sed -f $(srcdir)/strip.sed $(srcdir)/$$f >$$f-s; \
-       done
-       touch $@
-
-stamp-wrap:
-       if test -n "$(tmac_wrap)"; then \
-         for m in ""$(tmac_wrap); do \
-           rm -f $$m-wrap; \
-           if test "$$m" = an; then \
-             echo .do mso andoc.tmac >>$$m-wrap; \
-           fi; \
-           echo .cp 1 >>$$m-wrap; \
-           echo .so $(sys_tmac_prefix)$$m >>$$m-wrap; \
-         done; \
-       fi
-       touch $@
-
-stamp-sed: www.tmac
-       sed -e "s;@PNMTOPS_NOSETPAGE@;$(pnmtops_nosetpage);g" \
-         $(srcdir)/www.tmac > www.tmac-sed
-       touch $@
-
-uninstall_sub:
-       -if test -n "$(tmac_wrap)"; then \
-         for m in ""$(tmac_wrap); do \
-           rm -f $(DESTDIR)$(systemtmacdir)/$$m.tmac; \
-         done; \
-       fi
-       -for f in $(NORMALFILES) $(STRIPFILES); do \
-         rm -f $(DESTDIR)$(tmacdir)/$$f; \
-       done
-       rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
-       rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
-       rm -f $(DESTDIR)$(tmacdir)/www.tmac
-       -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \
-                  $(srcdir)/man.local; then \
-         rm -f $(DESTDIR)$(localtmacdir)/man.local; \
-       fi
-       -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \
-                  $(srcdir)/mdoc.local; then \
-         rm -f $(DESTDIR)$(localtmacdir)/mdoc.local; \
-       fi
-       -for f in $(MDOCFILES); do rm -f $(DESTDIR)$(mdocdir)/$$f; done
-       -rmdir $(DESTDIR)$(mdocdir)
diff --git a/tmac/doc-common b/tmac/doc-common-u
similarity index 100%
rename from tmac/doc-common
rename to tmac/doc-common-u
diff --git a/tmac/doc-ditroff b/tmac/doc-ditroff-u
similarity index 100%
rename from tmac/doc-ditroff
rename to tmac/doc-ditroff-u
diff --git a/tmac/doc-nroff b/tmac/doc-nroff-u
similarity index 100%
rename from tmac/doc-nroff
rename to tmac/doc-nroff-u
diff --git a/tmac/doc-old.tmac b/tmac/doc-old.tmac-u
similarity index 100%
rename from tmac/doc-old.tmac
rename to tmac/doc-old.tmac-u
diff --git a/tmac/doc-syms b/tmac/doc-syms-u
similarity index 100%
rename from tmac/doc-syms
rename to tmac/doc-syms-u
diff --git a/tmac/doc.tmac b/tmac/doc.tmac-u
similarity index 100%
rename from tmac/doc.tmac
rename to tmac/doc.tmac-u
diff --git a/tmac/e.tmac b/tmac/e.tmac-u
similarity index 100%
rename from tmac/e.tmac
rename to tmac/e.tmac-u
diff --git a/tmac/tmac.am b/tmac/tmac.am
new file mode 100644
index 0000000..34660f5
--- /dev/null
+++ b/tmac/tmac.am
@@ -0,0 +1,197 @@
+# Copyright (C) 1989-2007, 2009-2012, 2014
+#   Free Software Foundation, Inc.
+#      Written by James Clark (address@hidden)
+#      Automake migration by Bertrand Garrigues
+#
+# Last modified: Aug 2014
+#
+# This file is part of groff.
+#
+# groff is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# groff is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+tmac_srcdir = $(top_srcdir)/tmac
+
+man7_MANS += \
+  tmac/groff_ms.n \
+  tmac/groff_man.n \
+  tmac/groff_me.n \
+  tmac/groff_mdoc.n \
+  tmac/groff_trace.n \
+  tmac/groff_www.n
+
+TMACNORMALFILES = \
+  tmac/man.tmac \
+  tmac/mandoc.tmac \
+  tmac/andoc.tmac \
+  tmac/an-old.tmac \
+  tmac/an-ext.tmac \
+  tmac/ms.tmac \
+  tmac/me.tmac \
+  tmac/mdoc.tmac \
+  tmac/pic.tmac \
+  tmac/a4.tmac \
+  tmac/papersize.tmac \
+  tmac/62bit.tmac \
+  tmac/ec.tmac \
+  tmac/safer.tmac \
+  tmac/trace.tmac \
+  tmac/ps.tmac \
+  tmac/psold.tmac \
+  tmac/pspic.tmac \
+  tmac/psatk.tmac \
+  tmac/pdf.tmac \
+  tmac/dvi.tmac \
+  tmac/tty.tmac \
+  tmac/tty-char.tmac \
+  tmac/latin1.tmac \
+  tmac/latin2.tmac \
+  tmac/latin5.tmac \
+  tmac/latin9.tmac \
+  tmac/cp1047.tmac \
+  tmac/unicode.tmac \
+  tmac/X.tmac \
+  tmac/Xps.tmac \
+  tmac/lj4.tmac \
+  tmac/lbp.tmac \
+  tmac/html.tmac \
+  tmac/html-end.tmac \
+  tmac/devtag.tmac \
+  tmac/europs.tmac \
+  tmac/composite.tmac \
+  tmac/fallbacks.tmac \
+  tmac/eqnrc \
+  tmac/refer.tmac \
+  tmac/refer-me.tmac \
+  tmac/refer-ms.tmac \
+  tmac/troffrc \
+  tmac/troffrc-end \
+  tmac/trans.tmac \
+  tmac/hyphen.us \
+  tmac/hyphenex.us \
+  tmac/fr.tmac \
+  tmac/hyphen.fr \
+  tmac/sv.tmac \
+  tmac/hyphen.sv \
+  tmac/de.tmac \
+  tmac/den.tmac \
+  tmac/hyphen.det \
+  tmac/hyphen.den \
+  tmac/hyphenex.det \
+  tmac/cs.tmac \
+  tmac/hyphen.cs \
+  tmac/hyphenex.cs \
+  tmac/ja.tmac
+NORMALFILES = `echo $(TMACNORMALFILES) | sed -e "s|tmac/||g"`
+
+# TMACMDOCFILES and TMACSTRIPFILES are build from their unstripped version ( 
-u)
+TMACSPECIALFILES = tmac/an.tmac tmac/s.tmac tmac/www.tmac
+TMACSTRIPFILES = tmac/e.tmac tmac/doc.tmac tmac/doc-old.tmac
+
+# Files installed in tmacdir
+dist_tmac_DATA = $(TMACNORMALFILES) $(TMACSPECIALFILES) $(TMACSTRIPFILES)
+
+TMACMDOCFILES = \
+  tmac/doc-common \
+  tmac/doc-ditroff \
+  tmac/doc-nroff \
+  tmac/doc-syms
+MDOCFILES = `echo $(TMACMDOCFILES) | sed -e "s|tmac/||g"`
+mdocdir=$(tmacdir)/mdoc
+# Files installed in mdocdir
+nodist_mdoc_DATA = $(TMACMDOCFILES)
+
+# Installed in localtmacdir
+dist_localtmac_DATA = tmac/man.local tmac/mdoc.local
+
+MOSTLYCLEANFILES += $(TMACMDOCFILES) $(TMACSPECIALFILES) $(TMACSTRIPFILES) \
+   tmac/stamp-wrap \
+   tmac/*-wrap
+
+# FIXME
+# Original Makefile.sub forced the following variables that are
+# originally defined in the top Makefile.am. We don't use them here,
+# if they are needed custom install commands should be written
+#
+# tmac_s_prefix=
+# tmac_an_prefix=
+# tmac_wrap=
+# sys_tmac_prefix=
+
+EXTRA_DIST += \
+  tmac/fixmacros.sed \
+  tmac/groff_ms.man \
+  tmac/groff_man.man \
+  tmac/groff_me.man \
+  tmac/groff_mdoc.man \
+  tmac/groff_trace.man \
+  tmac/groff_www.man \
+  tmac/hyphenex.pl \
+  tmac/LOCALIZATION \
+  tmac/man.ultrix \
+  tmac/psfig.tmac \
+  tmac/ptx.tmac \
+  tmac/strip.sed \
+  tmac/TESTING-HINTS \
+  tmac/TODO \
+  tmac/www.tmac.in
+
+dist-hook: tmac-dist-hook
+tmac-dist-hook:
+       chmod u+w $(distdir)/tmac
+       for f in $(TMACMDOCFILES) $(TMACSTRIPFILES); do \
+         cp -f $(top_srcdir)/$$f-u $(distdir)/tmac; \
+       done
+
+all: tmac/stamp-wrap
+
+$(TMACMDOCFILES) $(TMACSTRIPFILES): 
+       $(MKDIR_P) $(top_builddir)/tmac
+       for f in $(TMACMDOCFILES) $(TMACSTRIPFILES); do \
+          sed -f $(tmac_srcdir)/strip.sed $(top_srcdir)/$$f-u > 
$(top_builddir)/$$f; \
+       done
+
+tmac/stamp-wrap:
+       $(MKDIR_P) $(top_builddir)/tmac;
+       if test -n "$(tmac_wrap)"; then \
+         for m in ""$(tmac_wrap); do \
+           rm -f $(top_builddir)/tmac/$$m-wrap; \
+           if test "$$m" = an; then \
+             echo .do mso $(tmac_srcdir)/andoc.tmac 
>>$(top_builddir)/tmac/$$m-wrap; \
+           fi; \
+           echo .cp 1 >>$(top_builddir)/tmac/$$m-wrap; \
+           echo .so $(sys_tmac_prefix)$$m >>$(top_builddir)/tmac/$$m-wrap; \
+         done; \
+       fi
+       touch $@
+
+tmac/www.tmac: tmac/www.tmac.in
+       $(MKDIR_P) $(top_builddir)/tmac
+       sed -e "s;address@hidden@];$(pnmtops_nosetpage);g" \
+         $(tmac_srcdir)/www.tmac.in > $(top_builddir)/tmac/www.tmac
+
+uninstall-hook: uninstall_tmac_hook
+uninstall_tmac_hook:
+       -if test -n "$(tmac_wrap)"; then \
+         for m in ""$(tmac_wrap); do \
+           rm -f $(DESTDIR)$(systemtmacdir)/$$m.tmac; \
+         done; \
+       fi
+       if test -d $(DESTDIR)$(mdocdir); then \
+         rmdir $(DESTDIR)$(mdocdir); \
+       fi
+       if test -d $(DESTDIR)$(tmacdir); then \
+         rmdir $(DESTDIR)$(tmacdir); \
+       fi
+       if test -d $(DESTDIR)$(localtmacdir); then \
+         rmdir $(DESTDIR)$(localtmacdir); \
+       fi
diff --git a/tmac/www.tmac b/tmac/www.tmac.in
similarity index 100%
rename from tmac/www.tmac
rename to tmac/www.tmac.in