From 65d0aa7f89fb1aab35e3aa4980a249d9e60c1087 Mon Sep 17 00:00:00 2001 From: sof Date: Tue, 2 Feb 1999 14:16:29 +0000 Subject: [PATCH] [project @ 1999-02-02 14:16:28 by sof] - define and use *_OPTS for the various sgmltools. - acknowledge the existence of INSTALL_LIB_SCRIPTS. --- mk/opts.mk | 6 +++++- mk/suffix.mk | 18 +++++++++--------- mk/target.mk | 11 ++++++----- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/mk/opts.mk b/mk/opts.mk index a2adab1..dc0a0a4 100644 --- a/mk/opts.mk +++ b/mk/opts.mk @@ -5,7 +5,7 @@ # This file defines Make variables for the # option flags for each utility program # -# $Id: opts.mk,v 1.8 1998/10/07 14:18:31 simonm Exp $ +# $Id: opts.mk,v 1.9 1999/02/02 14:16:28 sof Exp $ # ################################################################################# @@ -108,6 +108,10 @@ MKDEPENDHS_OPTS = $(SRC_MKDEPENDHS_OPTS) $(WAY$(_way)_MKDEPENDHS_OPTS) \ $(EXTRA_MKDEPENDHS_OPTS) MKDEPENDLIT_OPTS = $(SRC_MKDEPENDLIT_OPTS) $(WAY$(_way)_MKDEPENDLIT_OPTS) \ $(EXTRA_MKDEPENDLIT_OPTS) +SGML2LATEX_OPTS = $(SRC_SGML2LATEX_OPTS) $(WAY$(_way)_SGML2LATEX_OPTS) $(EXTRA_SGML2LATEX_OPTS) +SGML2INFO_OPTS = $(SRC_SGML2INFO_OPTS) $(WAY$(_way)_SGML2INFO_OPTS) $(EXTRA_INFO_OPTS) +SGML2TXT_OPTS = $(SRC_SGML2TXT_OPTS) $(WAY$(_way)_SGML2TXT_OPTS) $(EXTRA_SGML2TXT_OPTS) +SGML2HTML_OPTS = $(SRC_SGML2HTML_OPTS) $(WAY$(_way)_SGML2HTML_OPTS) $(EXTRA_SGML2HTML_OPTS) UGEN_OPTS = $(SRC_UGEN_OPTS) $(WAY$(_way)_UGEN_OPTS) $(EXTRA_UGEN_OPTS) UNLIT_OPTS = $(SRC_UNLIT_OPTS) $(WAY$(_way)_UNLIT_OPTS) $(EXTRA_UNLIT_OPTS) YACC_OPTS = $(SRC_YACC_OPTS) $(WAY$(_way)_YACC_OPTS) $(EXTRA_YACC_OPTS) diff --git a/mk/suffix.mk b/mk/suffix.mk index 0268f5f..6e212ff 100644 --- a/mk/suffix.mk +++ b/mk/suffix.mk @@ -211,27 +211,27 @@ SRC_HC_PRE_OPTS += $(HC_PRE__) %.tex : %.sgml @$(RM) $@ - $(SGML2LATEX) -m --output=tex $< + $(SGML2LATEX) $(SGML2LATEX_OPTS) -m --output=tex $< %.dvi : %.sgml @$(RM) $@ - $(SGML2LATEX) -m --output=dvi $< + $(SGML2LATEX) $(SGML2LATEX_OPTS) -m --output=dvi $< -%,ps : %.sgml +%.ps : %.sgml @$(RM) $@ - $(SGML2LATEX) -m --output=ps $< + $(SGML2LATEX) $(SGML2LATEX_OPTS) -m --output=ps $< %.html : %.sgml @$(RM) $@ - $(SGML2HTML) $< + $(SGML2HTML) $(SGML2HTML_OPTS) $< %.info : %.sgml @$(RM) $@ - $(SGML2INFO) $< + $(SGML2INFO) $(SGML2INFO_OPTS) $< %.txt : %.sgml @$(RM) $@ - $(SGML2TXT) $< + $(SGML2TXT) $(SGML2TXT_OPTS) $< #----------------------------------------------------------------------------- # Literate suffix rules @@ -243,10 +243,10 @@ SRC_HC_PRE_OPTS += $(HC_PRE__) %.c : %.lc @$(RM) $@ - $(UNLIT) $< $@ + $(UNLIT) $(UNLIT_OPTS) $< $@ @chmod 444 $@ %.h : %.lh @$(RM) $@ - $(UNLIT) $< $@ + $(UNLIT) $(UNLIT_OPTS) $< $@ @chmod 444 $@ diff --git a/mk/target.mk b/mk/target.mk index 3011f21..7743c42 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -459,11 +459,12 @@ endif # For each of these variables that is defined, you # get one install rule # -# INSTALL_PROGS executable programs in $(bindir) -# INSTALL_SCRIPTS executable scripts in $(bindir) -# INSTALL_LIBS platform-dependent libraries in $(libdir) (ranlib'ed) -# INSTALL_LIBEXECS platform-dependent execs in $(libdir) -# INSTALL_DATAS platform-independent files in $(datadir) +# INSTALL_PROGS executable programs in $(bindir) +# INSTALL_SCRIPTS executable scripts in $(bindir) +# INSTALL_LIBS platform-dependent libraries in $(libdir) (ranlib'ed) +# INSTALL_LIB_SCRIPTS platform-dependent scripts in $(libdir) +# INSTALL_LIBEXECS platform-dependent execs in $(libdir) +# INSTALL_DATAS platform-independent files in $(datadir) # # If the installation directory variable is undefined, the install rule simply # emits a suitable error message. -- 1.7.10.4