Changeset 64c6d1 in git for doc

Timestamp:

Jun 3, 1998, 12:04:30 PM (26 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

88e48a8bf8bdcee21c6f8cc76efb29c06ce04a7b

Parents:

b9d3335d3643e630740a082ced8fc9b82bc915e2

Message:

* new file/dir layout of LIBs, bin, doc:
  LIB stays in-place, (new)doc moves to root, tests is removed
* LIB loading with "~"
* SearchPath is dynamically determined (see febase.cc)
* info prog is searched for in bindir
* correct handling of .singurlarrc
* env variable SINGULARHIST is used for determining history-file
* res always returns resolution
* configure is more robust (i.e., complains earlier if something is
  wrong)


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

Location:

doc

Files:

• Makefile.in (modified) (6 diffs)
• general.doc (modified) (previous)
• reference.doc (modified) (previous)

doc/Makefile.in

@@ -13 +13 @@
 ## directory where info files are installed
 prefix          = @prefix@
-infodir         = @infodir@
+infodir         = ${prefix}/info
 
 ##
@@ -30 +30 @@
 DVIPS           = dvips
 
-# directory where Singular executable is found
-SINGULARDIR     = ..
-
+SINGULAR        = @SINGULAR@
 ##
 ## End configuration dependend stuff
@@ -44 +42 @@
         singular.tex start.tex types.tex pdata.tex
 
-all: info dvi
+all: info dvi 
 
 info: singular.hlp 
@@ -56 +54 @@
         ${DVIPS} singular.dvi -o
         ${DVIPS} tutor.dvi -o
+        ${DVIPS} usercard.dvi  -o
 
 singular.dvi:  ${SINGULAR_OBJS} ${TEX_FILES} Makefile
@@ -96 +95 @@
         /bin/rm -f *.dvi singular.hlp configure ${SINGULAR_OBJS}
 
-singular.tex :  singular.doc  doc2tex ${SINGULARDIR}/Singular
-        SINGULARPATH=${SINGULARDIR}/LIB; export SINGULARPATH; \
-        PATH=`pwd`/${SINGULARDIR}:$(PATH); export PATH; \
-        ./doc2tex ${SINGULARDIR}/Singular singular
+singular.tex :  singular.doc  doc2tex ${SINGULAR}
+        ./doc2tex ${SINGULAR} singular
         echo expect one error
         -grep "error occurred" singular.tex
 
-%.tex: %.doc doc2tex ${SINGULARDIR}/Singular
-        SINGULARPATH=${SINGULARDIR}/LIB; export SINGULARPATH; \
-        PATH=`pwd`/${SINGULARDIR}:$(PATH); export PATH; \
-        ./doc2tex ${SINGULARDIR}/Singular $*
+%.tex: %.doc doc2tex ${SINGULAR}
+        ./doc2tex ${SINGULAR} $*
         -grep "error occurred" $@
 
@@ -113 +108 @@
         $(CC) doc2tex.c -o doc2tex
 
-${SINGULARDIR}/Singular:
-        cd ${SINGULARDIR}; ${MAKE} Singular
+${SINGULAR}: 
+        cd ${prefix}; ${MAKE} ${SINGULAR}
 
 Makefile: Makefile.in
-        cd ${SINGULARDIR}; ${MAKE} newdoc/Makefile
+        cd ${prefix}; ${MAKE} Makefile
 
 #examples.tex: examples.doc