Re: [PATCH] packages: Fixing tm rules for info and html
Adrian.Aichner(a)t-online.de (Adrian Aichner) writes:
Coming up with this solution was not easy.
Nice job. Works for me. Thanks, Adrian.
Now I find I am unable to build liece because of:
Symbol's function definition is void: mime-charset-p
I saw a message that a patch for this had been applied, but I don't
see the patch in CVS.
- vin
Adrian.Aichner(a)t-online.de (Adrian Aichner) writes:
> Hi Vin,
>
> could you please try out this patch in your environment?
>
> It works well for me.
>
> Steve, I have removed the MANUAL variable.
>
> I haven't found it used anywhere.
>
> What is it good for?
>
Coming up with this solution was not easy.
>
> I have hooked up the original tm/texi logic with the packages-wide
> variables TEXI_FILES, INFO_FILES, HTML_FILES, and HTML_DEP and did
> some testing for BUILD_WITHOUT_MULE for values "" and t.
>
> Best regards,
>
> Adrian
>
> packages ChangeLog patch:
> Diff command: cvs -q diff -U 0
> Files affected: xemacs-packages/tm/ChangeLog
>
> Index: xemacs-packages/tm/ChangeLog
> ===================================================================
> RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tm/ChangeLog,v
> retrieving revision 1.28
> diff -u -U0 -r1.28 ChangeLog
> --- xemacs-packages/tm/ChangeLog 2002/03/22 07:31:38 1.28
> +++ xemacs-packages/tm/ChangeLog 2002/03/24 18:43:48
> ＠＠ -0,0 +1,16 ＠＠
> +2002-03-24 Adrian Aichner <adrian(a)xemacs.org>
> +
> + * texi/Makefile (TEXI_FILES): New.
> + * texi/Makefile (INFO_FILES): New.
> + * texi/Makefile (html): New.
> +
> +2002-03-24 Adrian Aichner <adrian(a)xemacs.org>
> +
> + * Makefile (BUILD_WITHOUT_MULE): Move handling of INFO_FILES and
> + TEXI_FILES to texi/Makefile.
> + * Makefile (INFO_FILES): Moved to texi/Makefile.
> + * Makefile (TEXI_FILES): Ditto.
> + * Makefile (MANUAL): Removed.
> + * Makefile (html): Use -C switch like other Makefiles do.
> + * Makefile (clean): New.
> +
>
> packages source patch:
> Diff command: cvs -f -z3 -q diff -u
> Files affected: xemacs-packages/tm/texi/Makefile xemacs-packages/tm/Makefile
>
> Index: xemacs-packages/tm/Makefile
> ===================================================================
> RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tm/Makefile,v
> retrieving revision 1.35
> diff -u -r1.35 Makefile
> --- xemacs-packages/tm/Makefile 2002/03/22 07:31:38 1.35
> +++ xemacs-packages/tm/Makefile 2002/03/24 18:38:25
> ＠＠ -38,24 +38,11 ＠＠
> tm-rmail.elc tm-setup.elc tm-tar.elc tm-text.elc tm-view.elc \
> tm-vm.elc tmh-comp.elc tu-comment.elc tu-replace.elc
>
> -INFO_FILES = texi/gnus-mime-en.info texi/tm-edit-en.info \
> - texi/tm-en.info texi/tm-mh-e-en.info \
> - texi/tm-view-en.info texi/tm-vm-en.info
> -TEXI_FILES = texi/gnus-mime-en.texi \
> - texi/tm-edit-en.texi texi/tm-en.texi \
> - texi/tm-mh-e-en.texi texi/tm-view-en.texi texi/tm-vm-en.texi
> -MANUAL = tm-en tm-edit-en tm-view-en gnus-mime-en tm-mh-e-en
> -
> LIBSRC_FILES = $(wildcard lib-src/[a-z]*)
>
> include ../../XEmacs.rules
>
> ifeq ($(BUILD_WITHOUT_MULE),)
> -TEXI_FILES += texi/gnus-mime-ja.texi texi/tm-edit-ja.texi \
> - texi/tm-ja.texi texi/tm-mh-e-ja.texi texi/tm-view-ja.texi
> -INFO_FILES += texi/gnus-mime-ja.info texi/tm-edit-ja.info \
> - texi/tm-ja.info texi/tm-mh-e-ja.info texi/tm-view-ja.info
> -MANUAL += tm-ja tm-edit-ja tm-view-ja gnus-mime-ja tm-mh-e-ja
> ELCS += latex-math-symbol.elc
> endif
>
> ＠＠ -64,8 +51,11 ＠＠
>
> all:: $(ELCS) auto-autoloads.elc texi
>
> +clean::
> + $(MAKE) $(MFLAGS) -C texi clean
> +
> html:
> - cd texi && $(MAKE) html
> + $(MAKE) -C texi html
>
> texi:
> $(MAKE) EMACS=$(XEMACS) -C texi info
> Index: xemacs-packages/tm/texi/Makefile
> ===================================================================
> RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tm/texi/Makefile,v
> retrieving revision 1.4
> diff -u -r1.4 Makefile
> --- xemacs-packages/tm/texi/Makefile 2002/03/22 07:31:40 1.4
> +++ xemacs-packages/tm/texi/Makefile 2002/03/24 18:38:25
> ＠＠ -17,36 +17,39 ＠＠
> # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
> # Boston, MA 02111-1307, USA.
>
> -include ../../../XEmacs.rules
> -
> # The japanese texinfo files requires the very latest 20.0 xemacs
> EMACS = ../../src/xemacs
> NAMES = tm tm-edit tm-view gnus-mime tm-mh-e
> NAMES_EN = $(NAMES:%=%-en) tm-vm-en
> -NAMES_JA = $(NAMES:%=%-ja)
> -NAMES_ALL = $(NAMES_EN) $(NAMES_JA)
> -#NAMES_ALL = $(NAMES_EN)
> -INFOS = $(NAMES_ALL:%=%.info)
> -DVIS = $(NAMES_EN:%=%.dvi)
>
> TEXI2DVI = texi2dvi
> MAKEINFO = makeinfo
>
> -HTML_FILES = gnus-mime-en*.html tm-edit-en*.html \
> - tm-en*.html tm-mh-e-en*.html \
> - tm-view-en*.html tm-vm-en*.html
> -HTML_DEP = gnus-mime-en.html tm-edit-en.html \
> - tm-en.html tm-mh-e-en.html \
> - tm-view-en.html tm-vm-en.html
> +include ../../../XEmacs.rules
>
> ifeq ($(BUILD_WITHOUT_MULE),)
> -HTML_FILES += gnus-mime-ja.html tm-edit-ja.html \
> - tm-ja.html tm-mh-e-ja.html tm-view-ja.html
> +NAMES_JA = $(NAMES:%=%-ja)
> endif
>
> +NAMES_ALL = $(NAMES_EN) $(NAMES_JA)
> +INFOS = $(NAMES_ALL:%=%.info)
> +DVIS = $(NAMES_EN:%=%.dvi)
> +
> +TEXI_FILES = $(NAMES_ALL:%=%.texi)
> +INFO_FILES = $(TEXI_FILES:%.texi=%.info)
> +
> +HTML_DEP = $(TEXI_FILES:%.texi=%.html)
> +HTML_FILES = $(HTML_DEP:%.html=%*.html)
> +
> # List of all the texinfo files in the manual:
>
> all:: info
> +
> +# APA: Explicit target is necessary because XEmacs.rules needs to be
> +# included before use of BUILD_WITHOUT_MULE and the latter modifies
> +# target HTML_DEP (and others).
> +html: $(HTML_DEP)
> +
> info : $(INFOS)
>
> %-en.info : %-en.texi
>
> --
> Adrian Aichner
> mailto:adrian＠xemacs.org
> http://www.xemacs.org/