Changeset 6dd750 in git

Timestamp:

Feb 6, 2003, 8:37:14 PM (20 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

60a84f38952acc39ca637bd7da65be4279271915

Parents:

1e0992f2fedf9c1084dddc7a67434f617e93e72f

Message:

plural doc merges with singular


git-svn-id: file:///usr/local/Singular/svn/trunk@6482 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

doc

Files:

• Makefile.in (modified) (6 diffs)
• plural.doc (modified) (previous)
• plureference.doc (modified) (previous)
• plutypes.doc (modified) (previous)
• singular.doc (modified) (previous)

doc/Makefile.in

@@ -2 +2 @@
 ###
 ### Makefile for Singular documentation
-### $Id: Makefile.in,v 1.83 2002-12-20 14:11:27 levandov Exp $
+### $Id: Makefile.in,v 1.84 2003-02-06 19:33:15 levandov Exp $
 #####################################################################
 SHELL=/bin/sh
@@ -104 +104 @@
 
 PLU_DOC2TEX_FILES       = \
-                plumath.tex plureference.tex plutypes.tex
+                plural.tex plumath.tex plureference.tex plutypes.tex
 
 MANUAL_FILES    = ${TEX_FILES} ${DOC2TEX_FILES}
@@ -134 +134 @@
 info: singular.hlp
 
-singular.hlp: ${MANUAL_FILES} singular.tex
+singular.hlp: ${MANUAL_FILES} singular.tex ${PLU_MANUAL_FILES}
         - ${MAKEINFO} --no-split singular.tex
 
-plural.hlp:     ${PLU_MANUAL_FILES} plural.tex
-        - ${MAKEINFO} --no-split plural.tex
+plural.hlp:  ${PLU_MANUAL_FILES} pluralmain.tex
+        - ${MAKEINFO} --no-split -o plural.hlp pluralmain.tex
 
 # dvi stuff
@@ -170 +170 @@
         ${DOC2TEX} -no_fun -o manual.tex singular.doc
 
-singular.tex: ${MANUAL_FILES} doc2tex.pl ${LIB_TEX_FILES} ${SINGULAR} ${LIBPARSE} singular.doc $(STANDALONE_TEXI_FILES)
+singular.tex: ${MANUAL_FILES} doc2tex.pl ${LIB_TEX_FILES} ${SINGULAR} ${LIBPARSE} singular.doc $(STANDALONE_TEXI_FILES) ${PLU_MANUAL_FILES}
         ${DOC2TEX} -o singular.tex singular.doc
 
-plural.tex: ${PLU_MANUAL_FILES} doc2tex.pl ${PLU_LIB_TEX_FILES} ${SINGULAR} ${LIBPARSE} plural.doc $(STANDALONE_TEXI_FILES)
-        ${DOC2TEX} -o plural.tex plural.doc
+pluralmain.tex: ${PLU_MANUAL_FILES} doc2tex.pl ${PLU_LIB_TEX_FILES} ${SINGULAR} ${LIBPARSE} pluralmain.doc $(STANDALONE_TEXI_FILES)
+        ${DOC2TEX} -o pluralmain.tex pluralmain.doc
 
 #pattern rule for tex files
@@ -261 +261 @@
         -top_file ${HTML_MANUAL_TOP} singular.tex
 
-plu_html: ${TMP_DIR} ${PLU_HTML_SUBDIR}/${HTML_MANUAL_TOP} ${PLU_IMAGES_HTML}
+plu_html: ${PLU_MANUAL_FILES} ${TMP_DIR} ${PLU_HTML_SUBDIR}/${HTML_MANUAL_TOP} ${PLU_IMAGES_HTML} 
 ${PLU_HTML_SUBDIR}/${HTML_MANUAL_TOP}: ${TEXI2HTML_INIT} ${TEXI2HTML} plural.tex
         ${PERL} ${TEXI2HTML} ${PLU_TEXI2HTML_OPTS} -prefix ${PLU_HTML_MANUAL_PREFIX} \
-        -top_file ${HTML_MANUAL_TOP} plural.tex
+        -top_file ${HTML_MANUAL_TOP} pluralmain.tex
 
 # html stuff
@@ -294 +294 @@
         test -d ${PLU_HTML_SUBDIR} || mkdir ${PLU_HTML_SUBDIR}
         cp ${IMAGES_SRC} ${PLU_HTML_SUBDIR}
-
-