Changeset 94116e in git

Timestamp:

Mar 8, 2021, 10:58:48 PM (3 years ago)

Author:

Matthias Koeppe <mkoeppe@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '98550b669234b32be762076c32b3be2c35188ac4')

Children:

3664599bd33fee3cfa7cae8e08b9d6faf94adfff

Parents:

e312c9197391ebdeaa84d3ee4c9043c9a37ce9ff

Message:

Configure subdirectory doc

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• doc/Makefile.in (moved) (moved from doc/Makefile.bsp) (2 diffs)

Makefile.am

@@ -7 +7 @@
 
 EXTRA_DIST = README README.md README.pkg autogen.sh doxy redhat/singular.spec.in GPL2 GPL3
+EXTRA_DIST += doc/Makefile.in
 
 bin_SCRIPTS = libsingular-config

configure.ac

@@ -326 +326 @@
 AC_CONFIG_FILES([desktop/Makefile desktop/Singular.desktop desktop/Singular-manual.desktop])
 
+AC_CHECK_PROG(MAKEINFO, [makeinfo])
+AC_CHECK_PROG(TEXI2PDF, [texi2pdf])
+AC_CHECK_PROG(TEXINDEX, [texindex])
+AC_CHECK_PROG(DVIPS, [dvips])
+AC_CONFIG_FILES([doc/Makefile])
+
 AC_OUTPUT

doc/Makefile.in

@@ -11 +11 @@
 SINGUNAME       = spielwiese
 
-bindir          = @bindir@
+bindir          = @top_build_dir@/Singular
+EXEEXT          = @EXEEXT@
 
 ##
@@ -21 +22 @@
 PERL            = perl
 TEX             = tex
-MAKEINFO        = makeinfo --force
+MAKEINFO        = @MAKEINFO@ --force
 TEXI2PDF        = @TEXI2PDF@
 TEXINDEX        = @TEXINDEX@
 # use our local texi2html
 TEXI2HTML       = ./texi2html
-DVIPS           = dvips
+DVIPS           = @DVIPS@
 
 VERBOSE         = 1 # override this with make VERBOSE=2
 
 # d2t stuff
-SINGULAR        = /scratch/hannes/billbo-sw/Singular/Singular
+SINGULAR        = ${bindir}
 SINGULAR_LIB_DIR= ../Singular/LIB
-ifeq ($(SINGUNAME),"ix86-Win")
-LIBPARSE        = ${bindir}/libparse.exe
-else
-LIBPARSE        = ./libparse
-endif
+LIBPARSE        = ${bindir}/libparse${EXEEXT}
 DOC_SUBDIR      = ./d2t_singular
 EX_SUBDIR       = ./examples