[SCM] an open source computer algebra system branch, debian, updated. 5882919baf4961152170e01a9740932e4dc600aa
Bernhard R. Link
brlink at debian.org
Mon Mar 5 19:46:48 UTC 2012
The following commit has been merged in the debian branch:
commit 5882919baf4961152170e01a9740932e4dc600aa
Author: Bernhard R. Link <brlink at debian.org>
Date: Mon Mar 5 15:45:34 2012 +0100
reorder patches
- move patches accepted or commited upstream to the beginning.
- move templatedir patch to makefile variable instead.
- move soname patch to makefile variables instead
- drop "fix build issues" patch. Should no longer be needed with
the newer upstream.
diff --git a/.gitignore b/.gitignore
index cc6e3f7..976dbdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,7 +47,6 @@ GNUmakefile
/config.sub
/configure-stamp
/build-stamp
-/VERSION
/debian/files
/debian/tmp
/debian/libsingular-3-1-4
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 5b4ea59..b55deaa 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,5 +1,5 @@
# see git-dpm(1) from git-dpm package
-cd7a58d78788a23688d5d75fe07b6b22f20b1505
+8e1a0ace599552add19f1643ae4930b35e819df0
8e1a0ace599552add19f1643ae4930b35e819df0
af80c455bead480e8e21703ac28b5a5965265887
af80c455bead480e8e21703ac28b5a5965265887
diff --git a/debian/libsingular-3-1-4.install b/debian/libsingular-3-1-4.install
index 198d460..a506b64 100644
--- a/debian/libsingular-3-1-4.install
+++ b/debian/libsingular-3-1-4.install
@@ -1,2 +1 @@
-usr/lib/libsingular-*.so usr/lib/
usr/lib/singular-* usr/lib/
diff --git a/debian/libsingular-dev.install b/debian/libsingular-dev.install
index d7bbc66..f3a57da 100644
--- a/debian/libsingular-dev.install
+++ b/debian/libsingular-dev.install
@@ -1,2 +1 @@
usr/include/ usr/
-usr/lib/libsingular.so usr/lib/
diff --git a/debian/patches/0001-avoid-segfault-in-internal-help-parser.patch b/debian/patches/0001-avoid-segfault-in-internal-help-parser.patch
new file mode 100644
index 0000000..4b741a9
--- /dev/null
+++ b/debian/patches/0001-avoid-segfault-in-internal-help-parser.patch
@@ -0,0 +1,27 @@
+From 7d6ccb5bda9bcd580c39b79e2a66f7f6e56d9f4e Mon Sep 17 00:00:00 2001
+From: "Bernhard R. Link" <brlink at debian.org>
+Date: Sat, 3 Mar 2012 13:24:47 +0100
+Subject: avoid segfault in internal help parser
+
+the dummy help parser has a maximum length of index entries that is
+too short. Increase the constant to avoid that.
+
+Bug: http://www.singular.uni-kl.de:8002/trac/ticket/408
+Applied-Upstream: https://github.com/Singular/Sources/commit/ac1f9c07b80ebde3491189a494a1c90324e91baa
+---
+ Singular/fehelp.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Singular/fehelp.cc b/Singular/fehelp.cc
+index 34a0ffb..3c39bf9 100644
+--- a/Singular/fehelp.cc
++++ b/Singular/fehelp.cc
+@@ -1126,7 +1126,7 @@ static void heBuiltinHelp(heEntry hentry, int br)
+ #define HELP_NOT_OPEN 1
+ #define HELP_NOT_FOUND 2
+ #define BUF_LEN 256
+-#define IDX_LEN 64
++#define IDX_LEN 256
+ #define MAX_LINES 21
+
+ static inline char tolow(char p)
diff --git a/debian/patches/0001-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch b/debian/patches/0001-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
deleted file mode 100644
index 4593829..0000000
--- a/debian/patches/0001-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
+++ /dev/null
@@ -1,344 +0,0 @@
-From 1e1b7a9e31778df6e23138bb03e7b47d4d20152f Mon Sep 17 00:00:00 2001
-From: Felix Salfelder <felix at salfelder.org>
-Date: Thu, 16 Feb 2012 08:45:58 +0100
-Subject: use $DESTDIR as a pre-prefix, in install* targets
-
----
- IntegerProgramming/Makefile.in | 12 +++---
- Singular/Makefile.in | 85 ++++++++++++++++++----------------------
- factory/GNUmakefile.in | 25 ++++++------
- kernel/Makefile.in | 20 +++++-----
- libfac/Makefile.in | 14 +++---
- omalloc/Makefile.in | 22 +++++-----
- 6 files changed, 85 insertions(+), 93 deletions(-)
-
-diff --git a/IntegerProgramming/Makefile.in b/IntegerProgramming/Makefile.in
-index 5b5b5e6..0c6e6af 100644
---- a/IntegerProgramming/Makefile.in
-+++ b/IntegerProgramming/Makefile.in
-@@ -57,12 +57,12 @@ install-nolns: install
- install_all: install
-
- install install-libsingular: $(MAIN1) $(MAIN2) $(MAIN3) $(MAIN4) $(LLL)
-- ${MKINSTALLDIRS} ${bindir}
-- ${INSTALL_PROGRAM} $(MAIN1) ${bindir}
-- ${INSTALL_PROGRAM} $(MAIN2) ${bindir}
-- ${INSTALL_PROGRAM} $(MAIN3) ${bindir}
-- ${INSTALL_PROGRAM} $(MAIN4) ${bindir}
-- ${INSTALL_PROGRAM} $(LLL) ${bindir}
-+ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} $(MAIN1) $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} $(MAIN2) $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} $(MAIN3) $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} $(MAIN4) $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} $(LLL) $(DESTDIR)${bindir}
-
- install-bindist: $(MAIN1) $(MAIN2) $(MAIN3) $(MAIN4)
- ${MKINSTALLDIRS} ${install_bindir}
-diff --git a/Singular/Makefile.in b/Singular/Makefile.in
-index c6a3ecb..8f004e6 100644
---- a/Singular/Makefile.in
-+++ b/Singular/Makefile.in
-@@ -560,51 +560,42 @@ install_all: install
- install-nolns: all installbin-nolns installslib-nolns
-
- installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
-- ${MKINSTALLDIRS} ${bindir}
-- ${INSTALL_PROGRAM} ${SING_EXEC} ${SINGULAR}
-+ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${SINGULAR}
- -for file in *.so; do \
-- ${INSTALL_PROGRAM} $$file ${bindir}; \
-+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${bindir}; \
- done
-- ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} ${bindir}
-- ${INSTALL_PROGRAM} ESingular TSingular ${bindir}
-- ${INSTALL_PROGRAM} surfex ${bindir}
-- chmod a+x ${SINGULAR}
-- rm -f ${bindir}/${SING_EXEC}${EXEC_EXT}
-- cd ${bindir}; ${LN_S} ${SINGULAR} Singular${EXEC_EXT};
--
--installbin-nolns: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
-- ${MKINSTALLDIRS} ${bindir}
-- ${INSTALL_PROGRAM} ${SING_EXEC} ${SINGULAR}
-- -for file in *.so; do \
-- ${INSTALL_PROGRAM} $$file ${bindir}; \
-- done
-- ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} ${bindir}
-- ${INSTALL_PROGRAM} ESingular TSingular ${DL_LIBS} ${bindir}
-- chmod a+x ${SINGULAR}
-- rm -f ${bindir}/${SING_EXEC}${EXEC_EXT}
-- ${INSTALL_PROGRAM} ${SINGULAR} ${bindir}/Singular${EXEC_EXT};
-+ ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} ESingular TSingular $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} surfex $(DESTDIR)${bindir}
-+ chmod a+x $(DESTDIR)${SINGULAR}
-+ rm -f $(DESTDIR)${bindir}/${SING_EXEC}${EXEC_EXT}
-+ cd $(DESTDIR)${bindir}; ${LN_S} ${SINGULAR} Singular${EXEC_EXT};
-+
-+installbin-nolns: installbin
-+ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${install_bindir}/Singular${EXEC_EXT};
-
- installslib: LIB
- test -r ${slibdir} || ${LN_S} `pwd`/LIB ${slibdir}
-
- installslib-nolns: LIB
-- ${MKINSTALLDIRS} ${slibdir}
-+ ${MKINSTALLDIRS} $(DESTDIR)${slibdir}
- for file in `pwd`/LIB/*.lib; do \
-- ${INSTALL_DATA} $$file ${slibdir}; \
-+ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
- done
-- ${MKINSTALLDIRS} ${slibdir}/gftables
-+ ${MKINSTALLDIRS} $(DESTDIR)${slibdir}/gftables
- for file in `pwd`/LIB/gftables/*; do \
-- ${INSTALL_DATA} $$file ${slibdir}/gftables/; \
-+ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
- done
-
- install-libsingular: libsingular
-- ${MKINSTALLDIRS} ${includedir}/singular
-+ ${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
- for file in *.$(SO_SUFFIX); do \
-- ${INSTALL_PROGRAM} $$file ${libdir}; \
-+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
- done
-- ${INSTALL_PROGRAM} libsingular.h ${includedir}
-+ ${INSTALL_PROGRAM} libsingular.h $(DESTDIR)${includedir}
- for file in subexpr.h tok.h grammar.h ipid.h lists.h ipshell.h attrib.h; do \
-- sed -e "s:<kernel/:<singular/:" < $$file |sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" >${includedir}/singular/$$file ;\
-+ sed -e "s:<kernel/:<singular/:" < $$file |sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" >$(DESTDIR)${includedir}/singular/$$file ;\
- done
-
- uninstall: uninstallbin
-@@ -654,23 +645,23 @@ LIB/all.lib: LIB/all.lib.tmpl
-
- install-bindist: $(HEADERS) $(SOURCES) Makefile depend
- echo "#define MAKE_DISTRIBUTION " > distrib.h
-- sleep 1
-- ${MAKE} ${SING_EXEC} ESingular TSingular libparse ${RUN_SINGULARS}
-- ${MKINSTALLDIRS} ${install_bindir}
-- ${INSTALL_PROGRAM} ${SING_EXEC} ${install_bindir}/Singular
-- -${INSTALL_PROGRAM} *.so ${install_bindir}
-- ${INSTALL_PROGRAM} -s libparse ${RUN_SINGULARS} ESingular TSingular ${install_bindir}
-- ${INSTALL_PROGRAM} surfex ${install_bindir}
-+ # sleep 1
-+ ${MAKE} ${SING_EXEC} ESingular TSingular libparse $(DESTDIR)${RUN_SINGULARS}
-+ ${MKINSTALLDIRS} $(DESTDIR)${install_bindir}
-+ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${install_bindir}/Singular
-+ -${INSTALL_PROGRAM} *.so $(DESTDIR)${install_bindir}
-+ ${INSTALL_PROGRAM} -s libparse ${RUN_SINGULARS} ESingular TSingular $(DESTDIR)${install_bindir}
-+ ${INSTALL_PROGRAM} surfex $(DESTDIR)${install_bindir}
- echo "#undef MAKE_DISTRIBUTION " > distrib.h
-
- install-sharedist: ${SLIBS_FILES} LIB/gftables
-- ${MKINSTALLDIRS} ${install_slibdir}
-- cp ${SLIBS_FILES} ${install_slibdir}
-- ${MKINSTALLDIRS} ${install_slibdir}/gftables
-- cp ${GFTABLES} ${install_slibdir}/gftables
-- ${MKINSTALLDIRS} ${install_slibdir}/surfex
-- cp LIB/surfex/surfex.jar ${install_slibdir}/surfex
-- chmod -R +rX ${install_slibdir}/*
-+ ${MKINSTALLDIRS} $(DESTDIR)${install_slibdir}
-+ cp ${SLIBS_FILES} $(DESTDIR)${install_slibdir}
-+ ${MKINSTALLDIRS} $(DESTDIR)${install_slibdir}/gftables
-+ cp ${GFTABLES} $(DESTDIR)${install_slibdir}/gftables
-+ ${MKINSTALLDIRS} $(DESTDIR)${install_slibdir}/surfex
-+ cp LIB/surfex/surfex.jar $(DESTDIR)${install_slibdir}/surfex
-+ chmod -R +rX $(DESTDIR)${install_slibdir}/*
-
- tar:
- tar cf Singular-${SINGULAR_VERSION}-src.tar ${DISTFILES}
-@@ -768,8 +759,8 @@ mpsr_Tok.og: iparith.inc mpsr_Tok.cc
- $(CXXG) ${CXXFLAGSG} ${CPPFLAGS} ${CXXTEMPLFLAGSG} ${DEFSG} -c mpsr_Tok.cc -o mpsr_Tok.og
-
- installg: Singularg
-- ${MKINSTALLDIRS} ${bindir}
-- ${INSTALL_PROGRAM} Singularg ${bindir}
-+ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} Singularg $(DESTDIR)${bindir}
-
- ESingularg: mod2.h feOpt.cc version.h emacs.cc \
- feOptES.inc
-@@ -848,8 +839,8 @@ mpsr_Tok.op: iparith.inc mpsr_Tok.cc
- $(CXXP) ${CXXFLAGSP} ${CPPFLAGS} ${CXXTEMPLFLAGSP} ${DEFSP} -c mpsr_Tok.cc -o mpsr_Tok.op
-
- installp: Singularp
-- ${MKINSTALLDIRS} ${bindir}
-- ${INSTALL_PROGRAM} Singularp ${bindir}
-+ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} Singularp $(DESTDIR)${bindir}
-
- ##
- ## dependencies
-diff --git a/factory/GNUmakefile.in b/factory/GNUmakefile.in
-index ad1dcf1..1e8d80d 100644
---- a/factory/GNUmakefile.in
-+++ b/factory/GNUmakefile.in
-@@ -642,21 +642,22 @@ install_all: install libsingcf_p.a
- install-nolns: install
-
- installcf: cf
-- $(MKINSTALLDIRS) $(libdir)
-- $(MKINSTALLDIRS) $(includedir)
-- $(MKINSTALLDIRS) $(templatedir)
-- $(INSTALL_DATA) $(libfactory) $(libdir)/$(libfactory)
-- -$(INSTALL_DATA) libsingcf_g.a $(libdir)/libsingcf_g.a
-- -$(INSTALL_DATA) libsingcf_p.a $(libdir)/libsingcf_p.a
-- $(INSTALL_DATA) factory.h $(includedir)/factory.h
-- $(INSTALL_DATA) cf_gmp.h $(includedir)/cf_gmp.h
-- $(INSTALL_DATA) factoryconf.h $(includedir)/factoryconf.h
-- $(INSTALL_DATA) $(srcdir)/ftmpl_inst.cc $(templatedir)/ftmpl_inst.cc
-+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(includedir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(templatedir)
-+ $(INSTALL_DATA) $(libfactory) $(DESTDIR)$(libdir)/$(libfactory)
-+ -$(INSTALL_DATA) libsingcf_g.a $(DESTDIR)$(libdir)/libsingcf_g.a
-+ -$(INSTALL_DATA) libsingcf_p.a $(DESTDIR)$(libdir)/libsingcf_p.a
-+ $(INSTALL_DATA) factory.h $(DESTDIR)$(includedir)/factory.h
-+ $(INSTALL_DATA) cf_gmp.h $(DESTDIR)$(includedir)/factory/cf_gmp.h
-+ $(INSTALL_DATA) factoryconf.h $(DESTDIR)$(includedir)/factory/factoryconf.h
-+ # FIXME: what is templatedir?
-+ $(INSTALL_DATA) $(srcdir)/ftmpl_inst.cc $(DESTDIR)$(templatedir)/ftmpl_inst.cc
- for file in $(templatesrc) $(templateincl); do \
-- $(INSTALL_DATA) $(srcdir)/templates/$$file $(templatedir)/$$file; \
-+ $(INSTALL_DATA) $(srcdir)/templates/$$file $(DESTDIR)$(templatedir)/$$file; \
- done
- # we run `ranlib' another time for SUN machines
-- $(RANLIB) $(libdir)/$(libfactory)
-+ $(RANLIB) $(DESTDIR)$(libdir)/$(libfactory)
-
- installmem: mem
- $(MKINSTALLDIRS) $(libdir)
-diff --git a/kernel/Makefile.in b/kernel/Makefile.in
-index 13db562..7b8b77b 100644
---- a/kernel/Makefile.in
-+++ b/kernel/Makefile.in
-@@ -48,7 +48,7 @@ PIPE = @PIPE@
- CFLAGS = @CFLAGS@ ${PIPE}
- CXXFLAGS = @CXXFLAGS@ ${PIPE}
- CXXTEMPLFLAGS = @CXXTEMPLFLAGS@
--CPPFLAGS = -I${srcdir} -I.. -I at prefix@ @CPPFLAGS@
-+CPPFLAGS = -I${srcdir} -I.. -I at prefix@ @CPPFLAGS@
- DEFS = -DNDEBUG -DOM_NDEBUG -D at SING_UNAME@ @DEFS@
- LDFLAGS = @LDFLAGS@
- LD_DYN_FLAGS = @LD_DYN_FLAGS@
-@@ -236,7 +236,7 @@ libkernel.a: ${OBJS}
- -rm -f libkernel.a
- ar cr $@ $^
-
--p_Procs_Lib.o: p_Procs_Lib.inc
-+p_Procs_Lib.o: p_Procs_Dynamic.inc
-
- # Hmm compiling with -fomit-frame-pointer resulted in access violation
- # under cygwin
-@@ -253,12 +253,12 @@ p_Procs_Dynamic.o p_Procs_Lib.o p_Procs_Dynamic.og p_Procs_Lib.og\
- p_Procs_Dynamic.inc p_Procs_Lib.inc: p_Procs_Dynamic.h
-
- # here is how p_Procs_[Static|Dynamic].inc is generated
--p_Procs_Static.inc: p_Procs_Generate.cc p_Procs_Impl.h mod2.h
-+p_Procs_Static.inc: p_Procs_Generate.cc p_Procs_Impl.h |mod2.h
- $(CXX) $(CPPFLAGS) -g -Dp_Procs_Static p_Procs_Generate.cc -o p_Procs_Static
- ./p_Procs_Static > p_Procs_Static.xx && mv p_Procs_Static.xx p_Procs_Static.inc
- -rm -f p_Procs_Static p_Procs_Static.exe
-
--p_Procs_Dynamic.inc: p_Procs_Generate.cc p_Procs_Impl.h mod2.h
-+p_Procs_Dynamic.inc: p_Procs_Generate.cc p_Procs_Impl.h |mod2.h
- $(CXX) $(CPPFLAGS) -g -Dp_Procs_Dynamic p_Procs_Generate.cc -o p_Procs_Dynamic
- ./p_Procs_Dynamic > p_Procs_Dynamic.xx && mv p_Procs_Dynamic.xx p_Procs_Dynamic.inc
- -rm -f p_Procs_Dynamic p_Procs_Dynamic.exe
-@@ -272,9 +272,9 @@ p_Procs_%.so: p_Procs_Lib_%.dl_o
- install-nolns: install
-
- install-libsingular: install
-- -${MKINSTALLDIRS} ${includedir}
-- -${MKINSTALLDIRS} ${includedir}/singular
-- -for file in *.h kInline.cc; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > ${includedir}/singular/$$file; done
-+ ${MKINSTALLDIRS} $(DESTDIR)${includedir}
-+ ${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
-+ for file in *.h kInline.cc; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > $(DESTDIR)${includedir}/singular/$$file; done
-
- install: all installbin
-
-@@ -290,12 +290,12 @@ endif
-
-
- installbin: ${DL_LIBS} ${DL_LIBSG} libkernel.a libkernel_g.a
-- ${MKINSTALLDIRS} ${bindir}
-+ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
- - ranlib libkernel.a
- - ranlib libkernel_g.a
- ifeq (,${DL_LIBS})
- else
-- -${INSTALL_PROGRAM} ${DL_LIBS} ${bindir}
-+ ${INSTALL_PROGRAM} ${DL_LIBS} $(DESTDIR)${bindir}
- ifeq (,${DL_LIBSG})
- else
- -for file in ${DL_LIBS} ${DL_LIBSG}; do ${INSTALL_PROGRAM} $$file ../Singular; done
-@@ -307,7 +307,7 @@ install-bindist: ${DL_LIBS} libkernel.a
- ${MKINSTALLDIRS} ${bindir}
- ifeq (,${DL_LIBS})
- else
-- -${INSTALL_PROGRAM} ${DL_LIBS} ${bindir}
-+ ${INSTALL_PROGRAM} ${DL_LIBS} $(DESTDIR)${bindir}
- endif
-
- ##
-diff --git a/libfac/Makefile.in b/libfac/Makefile.in
-index ef7bc5a..62faadb 100644
---- a/libfac/Makefile.in
-+++ b/libfac/Makefile.in
-@@ -147,13 +147,13 @@ libsingfac_p.a: $(PROFOBJ)
- install-nolns: install
-
- install install-libsingular: all
-- ${MKINSTALLDIRS} ${includedir}
-- ${MKINSTALLDIRS} ${libdir}
-- ${INSTALL_DATA} ${LIBFACINCLUDE} ${includedir}
-- ${INSTALL_DATA} ${TARGETNAME}.a ${libdir}
-- -${INSTALL_DATA} libsingfac_g.a ${libdir}
-- $(RANLIB) ${libdir}/${TARGETNAME}.a
-- -$(RANLIB) ${libdir}/libsingfac_g.a
-+ ${MKINSTALLDIRS} $(DESTDIR)${includedir}
-+ ${MKINSTALLDIRS} $(DESTDIR)${libdir}
-+ ${INSTALL_DATA} ${LIBFACINCLUDE} $(DESTDIR)${includedir}
-+ ${INSTALL_DATA} ${TARGETNAME}.a $(DESTDIR)${libdir}
-+ -${INSTALL_DATA} libsingfac_g.a $(DESTDIR)${libdir}
-+ $(RANLIB) $(DESTDIR)${libdir}/${TARGETNAME}.a
-+ -$(RANLIB) $(DESTDIR)${libdir}/libsingfac_g.a
-
- install_all: install libsingfac_p.a
- -${INSTALL_DATA} libsingfac_p.a ${libdir}
-diff --git a/omalloc/Makefile.in b/omalloc/Makefile.in
-index 79cd909..4956179 100644
---- a/omalloc/Makefile.in
-+++ b/omalloc/Makefile.in
-@@ -185,17 +185,17 @@ install-libsingular:
- $(INSTALL) omalloc.h $(includedir)/singular
-
- install install-libsingular: all
-- $(MKINSTALLDIRS) $(libdir)
-- $(MKINSTALLDIRS) $(includedir)
-- $(INSTALL_DATA) libomalloc.a $(libdir)
-- $(RANLIB) $(libdir)/libomalloc.a
-- $(INSTALL_DATA) libomalloc_ndebug.a $(libdir)
-- $(RANLIB) $(libdir)/libomalloc_ndebug.a
-- $(INSTALL_DATA) omalloc.o $(libdir)
-- $(INSTALL_DATA) omalloc_debug.o $(libdir)
-- $(INSTALL_DATA) omalloc.h $(includedir)
-- $(INSTALL_DATA) omlimits.h $(includedir)
-- $(INSTALL_DATA) mylimits.h $(includedir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(includedir)
-+ $(INSTALL_DATA) libomalloc.a $(DESTDIR)$(libdir)
-+ $(RANLIB) $(DESTDIR)$(libdir)/libomalloc.a
-+ $(INSTALL_DATA) libomalloc_ndebug.a $(DESTDIR)$(libdir)
-+ $(RANLIB) $(DESTDIR)$(libdir)/libomalloc_ndebug.a
-+ $(INSTALL_DATA) omalloc.o $(DESTDIR)$(libdir)
-+ $(INSTALL_DATA) omalloc_debug.o $(DESTDIR)$(libdir)
-+ $(INSTALL_DATA) omalloc.h $(DESTDIR)$(includedir)
-+ $(INSTALL_DATA) omlimits.h $(DESTDIR)$(includedir)
-+ $(INSTALL_DATA) mylimits.h $(DESTDIR)$(includedir)
-
- install_all: install libomalloc_p.a
- $(INSTALL_DATA) libomalloc_p.a $(libdir)
diff --git a/debian/patches/0002-fixing-template-install-path-in-factory-configure.in.patch b/debian/patches/0002-fixing-template-install-path-in-factory-configure.in.patch
deleted file mode 100644
index 6189d1b..0000000
--- a/debian/patches/0002-fixing-template-install-path-in-factory-configure.in.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f5a0f9b3de3fc800f0cd57c7f020298fa2b62308 Mon Sep 17 00:00:00 2001
-From: Felix Salfelder <felix at salfelder.org>
-Date: Mon, 13 Feb 2012 19:45:34 +0100
-Subject: fixing template install path in factory/configure.in
-
-${includepath}/factory.h includes factory/templates/ftmpl_*.h, so thats
-were these templates should be installed to.
----
- factory/configure | 2 +-
- factory/configure.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/factory/configure b/factory/configure
-index e97c4dd..fa5b264 100755
---- a/factory/configure
-+++ b/factory/configure
-@@ -4748,7 +4748,7 @@ gftabledir='${datadir}/factory/gftables'
- explicit_gftabledir="$explicit_datadir/factory/gftables"
-
- # for installation of the templates
--templatedir='${includedir}/templates'
-+templatedir='${includedir}/factory/templates'
-
- #
- # - the name of the game and the targets to create.
-diff --git a/factory/configure.in b/factory/configure.in
-index 46c82c1..e71f026 100644
---- a/factory/configure.in
-+++ b/factory/configure.in
-@@ -333,7 +333,7 @@ gftabledir='${datadir}/factory/gftables'
- explicit_gftabledir="$explicit_datadir/factory/gftables"
-
- # for installation of the templates
--templatedir='${includedir}/templates'
-+templatedir='${includedir}/factory/templates'
-
- #
- # - the name of the game and the targets to create.
diff --git a/debian/patches/0002-tag-MP-using-examples.patch b/debian/patches/0002-tag-MP-using-examples.patch
new file mode 100644
index 0000000..aa48286
--- /dev/null
+++ b/debian/patches/0002-tag-MP-using-examples.patch
@@ -0,0 +1,99 @@
+From 214c96a8ba75a03ae3b280686aa6ef487b4131f7 Mon Sep 17 00:00:00 2001
+From: "Bernhard R. Link" <brlink at debian.org>
+Date: Sat, 3 Mar 2012 10:16:25 +0100
+Subject: tag MP using examples
+
+Properly tag all examples using MP functions, so that the documentation
+can be built even if built without MP.
+
+Bug: http://www.singular.uni-kl.de:8002/trac/ticket/407
+---
+ doc/general.doc | 8 ++++----
+ doc/reference.doc | 4 ++--
+ doc/types.doc | 4 ++--
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/doc/general.doc b/doc/general.doc
+index 155ef21..d3f493a 100644
+--- a/doc/general.doc
++++ b/doc/general.doc
+@@ -2913,7 +2913,7 @@ For more information, see @ref{write}, @ref{read}, @ref{dump},
+
+ @strong{Example:}
+ @smallexample
+- at c example unix_only
++ at c example unix_only tag:MP
+ ring r; poly p = x+y;
+ dump("MPfile:w test.mp"); // dump the session to the file test.mp
+ kill r; // kill the basering
+@@ -2934,7 +2934,7 @@ Links have various properties which can be queried using the
+
+ @strong{Example:}
+ @smallexample
+- at c example unix_only
++ at c example unix_only tag:MP
+ link l = "MPtcp:fork";
+ l;
+ open(l);
+@@ -2988,7 +2988,7 @@ MPfile links are implemented on Unix-like operating systems only.
+
+ @strong{Example:}
+ @smallexample
+- at c example unix_only
++ at c example unix_only tag:MP
+ ring r;
+ // (over)write MPfile test.mp, link is specified as string
+ write("MPfile:w test.mp", x+y);
+@@ -3015,7 +3015,7 @@ MPtcp links are implemented on Unix-like operating systems only.
+
+ @strong{Example:}
+ @smallexample
+- at c example unix_only
++ at c example unix_only tag:MP
+ ring r;
+ link l = "MPtcp:launch"; // declare a link explicitly
+ open(l); // needs an open, launches another SINGULAR as a server
+diff --git a/doc/reference.doc b/doc/reference.doc
+index edf78fa..472f229 100644
+--- a/doc/reference.doc
++++ b/doc/reference.doc
+@@ -1604,7 +1604,7 @@ with @code{quote} and @code{write} to
+ prevent local evaluations when writing to an MPtcp link.
+ @item @strong{Example:}
+ @smallexample
+- at c example unix_only
++ at c example unix_only tag:MP
+ link l="MPfile:w example.mp";
+ ring r=0,(x,y,z),ds;
+ ideal i=maxideal(3);
+@@ -5708,7 +5708,7 @@ quote can be "undone" by an @code{eval} (i.e., each eval "undoes" the
+ effect of exactly one quote).
+ @item @strong{Example:}
+ @smallexample
+- at c example unix_only
++ at c example unix_only tag:MP
+ link l="MPfile:w example.mp";
+ ring r=0,(x,y,z),ds;
+ ideal i=maxideal(3);
+diff --git a/doc/types.doc b/doc/types.doc
+index 768559d..d6a688e 100644
+--- a/doc/types.doc
++++ b/doc/types.doc
+@@ -1638,7 +1638,7 @@ either for reading or for writing, but not for both at the same time. A
+
+ @*@strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:MP
+ ring r;
+ link l="MPfile:w example.mp"; // type=MPfile, mode=overwrite
+ l;
+@@ -1786,7 +1786,7 @@ is data to read.
+
+ @*@strong{Example:}
+ @smallexample
+- at c example unix_only
++ at c example unix_only tag:MP
+ LIB "general.lib"; // needed for "killall" command
+ link l="MPtcp:launch";
+ open(l); l; // l is ready for writing but not for reading
diff --git a/debian/patches/0003-fix-build-issues.patch b/debian/patches/0003-fix-build-issues.patch
deleted file mode 100644
index af00885..0000000
--- a/debian/patches/0003-fix-build-issues.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 46cf9c5875b6888cb9728a4d2db5eae7af356130 Mon Sep 17 00:00:00 2001
-From: Matthias Klose <doko at ubuntu.com>
-Date: Wed, 14 Sep 2011 14:39:30 +0200
-Subject: fix build issues
-
- * Fix FTBFS with ld --as-needed. LP: #832790.
- * Resolve unresolved symbols in shared libraries. Closes: #558958
----
- Singular/Makefile.in | 12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Singular/Makefile.in b/Singular/Makefile.in
-index 8f004e6..3bc2c32 100644
---- a/Singular/Makefile.in
-+++ b/Singular/Makefile.in
-@@ -380,13 +380,13 @@ Singular${S_EXT}: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
- ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} \
- -o Singular${S_EXT} \
- tesths.cc iparith.o mpsr_Tok.o claptmpl.o\
-- ${OBJS} ${LDFLAGS} ${LIBS} ../kernel/mmalloc.o
-+ ${OBJS} ${LDFLAGS} ${LIBS} ${LD_DYN_FLAGS} ../kernel/mmalloc.o
-
- libsingular: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
- iparith.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS)
- $(LIBSINGULAR_LD) ${SLDFLAGS} ${LIBSINGULAR_FLAGS} -o libsingular.${SO_SUFFIX} \
- iparith.o mpsr_Tok.o claptmpl.o \
-- ${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L${libdir} ${LIBSINGULAR_LIBS}
-+ ${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L${libdir} ${LIBSINGULAR_LIBS} -ldl
-
- libsingular.a: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
- iparith.o libparse.cc claptmpl.o mpsr_Tok.o
-@@ -419,13 +419,13 @@ claptmpl.o: claptmpl.cc mod2.h
- ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${DEFS} -c $<
-
- iparith.inc: gentable.cc grammar.h tok.h table.h mod2.h
-- ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} gentable.cc \
-+ ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} ${LD_DYN_FLAGS} gentable.cc \
- -o gentable1
- ./gentable1
- /bin/rm -f gentable1 gentable1.exe
-
- mpsr_Tok.inc: gentable2.cc grammar.h tok.h table.h mod2.h
-- ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} gentable2.cc \
-+ ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} ${LD_DYN_FLAGS} gentable2.cc \
- -o gentable2
- ./gentable2
- /bin/rm -f gentable2 gentable2.exe
-@@ -753,10 +753,10 @@ Singularg${S_EXT}: scanner.cc $(OBJG) $(DL_LIBSG)\
- ${LD_DYN_FLAGS2} ${LD_LIBC}
-
- iparith.og: iparith.inc iparith.cc
-- $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGSG} ${CPPFLAGS} ${DEFSG} -c iparith.cc -o iparith.og
-+ $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGSG} ${CPPFLAGS} ${DEFSG} -c iparith.cc -o iparith.og ${LD_DYN_FLAGS}
-
- mpsr_Tok.og: iparith.inc mpsr_Tok.cc
-- $(CXXG) ${CXXFLAGSG} ${CPPFLAGS} ${CXXTEMPLFLAGSG} ${DEFSG} -c mpsr_Tok.cc -o mpsr_Tok.og
-+ $(CXXG) ${CXXFLAGSG} ${CPPFLAGS} ${CXXTEMPLFLAGSG} ${DEFSG} -c mpsr_Tok.cc -o mpsr_Tok.og ${LD_DYN_FLAGS}
-
- installg: Singularg
- ${MKINSTALLDIRS} $(DESTDIR)${bindir}
diff --git a/debian/patches/0003-tag-more-examples.patch b/debian/patches/0003-tag-more-examples.patch
new file mode 100644
index 0000000..4c6a256
--- /dev/null
+++ b/debian/patches/0003-tag-more-examples.patch
@@ -0,0 +1,144 @@
+From d101cf4aac289d77496e41f917efd1b7938d91c8 Mon Sep 17 00:00:00 2001
+From: "Bernhard R. Link" <brlink at debian.org>
+Date: Sat, 3 Mar 2012 10:21:04 +0100
+Subject: tag more examples
+
+Add a way to tag all examples from a .lib file included.
+
+Use this new feature to tag some libs needed external programs,
+special features or significant memory usage in order to be able
+to build documentation on more machines.
+
+Make DOC2TEX_EXAMPLE_EXCLUSIONS a make variable, so that this
+setting can also be overridden at make invocation time.
+
+Bug: http://www.singular.uni-kl.de:8002/trac/ticket/409
+---
+ doc/Makefile.in | 6 ++++--
+ doc/doc2tex.pl | 12 ++++++++++--
+ doc/examples.doc | 2 +-
+ doc/pl2doc.pl | 3 ++-
+ doc/singular.doc | 6 +++---
+ 5 files changed, 20 insertions(+), 9 deletions(-)
+
+diff --git a/doc/Makefile.in b/doc/Makefile.in
+index 39ed588..7482778 100644
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -67,10 +67,12 @@ endif
+ DOC_SUBDIR = ./d2t_singular
+ EX_SUBDIR = ./examples
+ CHKSUM_DB = ${DOC_SUBDIR}/chksum
++DOC2TEX_EXAMPLE_EXCLUSIONS = @DOC2TEX_EXAMPLE_EXCLUSIONS@
+ DOC2TEX = ${PERL} ./doc2tex.pl -docdir ${DOC_SUBDIR} \
+ -Singular ${SINGULAR} -verbose ${VERBOSE} -make ${MAKE} \
+- -exdir ${EX_SUBDIR} @DOC2TEX_EXAMPLE_EXCLUSIONS@
+-PL2DOC = ${PERL} ./pl2doc.pl -db ${CHKSUM_DB}
++ -exdir ${EX_SUBDIR} ${DOC2TEX_EXAMPLE_EXCLUSIONS}
++TAG =
++PL2DOC = ${PERL} ./pl2doc.pl ${TAG} -db ${CHKSUM_DB}
+
+ # t2h stuff
+ TMP_DIR = @TMP_DIR@
+diff --git a/doc/doc2tex.pl b/doc/doc2tex.pl
+index 3254be2..12a3382 100755
+--- a/doc/doc2tex.pl
++++ b/doc/doc2tex.pl
+@@ -539,7 +539,7 @@ sub HandleRef
+
+ sub HandleLib
+ {
+- my($lib, $proc, $n_fun, $n_ex, $section, $tex_file);
++ my($lib, $proc, $n_fun, $n_ex, $section, $tex_file, $tag);
+
+ if (/^\@c\s*lib\s+([^\.]+)\.lib(.*)/)
+ {
+@@ -552,6 +552,14 @@ sub HandleLib
+ print TEX $_;
+ return;
+ }
++ if (/tag:(\w+)/)
++ {
++ $tag = "TAG='-tag ".$1."'";
++ }
++ else
++ {
++ $tag = '';
++ }
+
+ $proc = $1 if (/^:(.*?) /);
+ $n_fun = 1 if ($no_fun || /no_fun/);
+@@ -574,7 +582,7 @@ sub HandleLib
+ if ($make)
+ {
+ print "<lib $lib " if ($verbose);
+- System("$make $make_opts VERBOSE=$verbose $tex_file");
++ System("$make $make_opts $tag VERBOSE=$verbose $tex_file");
+ }
+
+ # make sure file exists
+diff --git a/doc/examples.doc b/doc/examples.doc
+index 613f4b4..637c421 100644
+--- a/doc/examples.doc
++++ b/doc/examples.doc
+@@ -787,7 +787,7 @@ which allows ignoring all but the first j entries of vectors when
+ forming the pairs in the standard basis computation.
+
+ @smallexample
+- at c example
++ at c example tag:dynlib
+ ring r=0,(x,y),dp;
+ module mo=[x^2-y^2,1,0,0],[xy+y^2,0,1,0],[y^2,0,0,1];
+ print(mo);
+diff --git a/doc/pl2doc.pl b/doc/pl2doc.pl
+index 1c28af0..cc3a5a2 100755
+--- a/doc/pl2doc.pl
++++ b/doc/pl2doc.pl
+@@ -20,6 +20,7 @@ while (@ARGV && $ARGV[0] =~ /^-/)
+ $_ = shift(@ARGV);
+ if (/^-o$/) { $out_file = shift(@ARGV); next;}
+ if (/^-db$/) { $db_file = shift(@ARGV); next;}
++ if (/^-tag$/) { $tag = $tag . " tag:" . shift(@ARGV); next;}
+ if (/^-no_fun$/) { $no_fun = 1;next;}
+ if (/^-doc$/) { $doc = 1; next;}
+ if (/^-h(elp)?$/) { print $Usage; exit;}
+@@ -120,7 +121,7 @@ unless ($no_fun)
+ ($ex = &CleanUpExample($lib, $example{$procs[$i]})))
+ {
+ print LDOC "\@strong{Example:}\n";
+- print LDOC "\@smallexample\n\@c example\n";
++ print LDOC "\@smallexample\n\@c example$tag\n";
+ print LDOC $ex;
+ print LDOC "\n\@c example\n\@end smallexample\n";
+ }
+diff --git a/doc/singular.doc b/doc/singular.doc
+index ca3274d..c14fa5d 100644
+--- a/doc/singular.doc
++++ b/doc/singular.doc
+@@ -442,7 +442,7 @@ LIB "all.lib";
+ @c ---------------------------------------------------------
+ @node normaliz_lib, pointid_lib, normal_lib, Commutative algebra
+ @subsection normaliz_lib
+- at c lib normaliz.lib
++ at c lib normaliz.lib tag:normaliz
+ @c ----------------------------------------------------------
+ @node pointid_lib, primdec_lib, normaliz_lib, Commutative algebra
+ @subsection pointid_lib
+@@ -474,7 +474,7 @@ LIB "all.lib";
+ @c ---------------------------------------------------------
+ @node sing4ti2_lib, toric_lib, sagbi_lib, Commutative algebra
+ @subsection sing4ti2_lib
+- at c lib sing4ti2.lib
++ at c lib sing4ti2.lib tag:sing4ti2
+ @c ---------------------------------------------------------
+ @node toric_lib, , sing4ti2_lib, Commutative algebra
+ @subsection toric_lib
+@@ -531,7 +531,7 @@ iniD, reslist, sumlist, dividelist, createlist
+ @c ---------------------------------------------------------
+ @node sheafcoh_lib, ,reszeta_lib, Algebraic geometry
+ @subsection sheafcoh_lib
+- at c lib sheafcoh.lib
++ at c lib sheafcoh.lib tag:memory
+ @c ----------------------------------------------------------------------------
+ @node Singularities, Invariant theory, Algebraic geometry, SINGULAR libraries
+ @section Singularities
diff --git a/debian/patches/0004-default-path-settings.patch b/debian/patches/0004-default-path-settings.patch
deleted file mode 100644
index cd63338..0000000
--- a/debian/patches/0004-default-path-settings.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 58d6e2e79d7dc7ea728d30891fcd89e57e2335a3 Mon Sep 17 00:00:00 2001
-From: "Bernhard R. Link" <brlink at debian.org>
-Date: Sat, 25 Feb 2012 13:47:46 +0100
-Subject: default path settings
-
-- Hardcode "Singular" pathname, so we can install the library to a
- different location than the binaries.
-- as S_BIN_DIR and S_ROOT_DIR are the same in the Debian package,
- don't default ROOT_DIR to BIN_DIR/..
-- xterm set as x-terminal-emulator alternative.
-- emacs binary located in /usr/bin
-- remove %b/.. and %r/.. from default search path in order to
- not look into /usr/lib/LIB for libraries.
----
- kernel/feResource.cc | 14 ++++++--------
- 1 files changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/kernel/feResource.cc b/kernel/feResource.cc
-index ba0385c..7b1be9b 100644
---- a/kernel/feResource.cc
-+++ b/kernel/feResource.cc
-@@ -76,13 +76,11 @@ static feResourceConfig_s feResourceConfigs[] =
- "%b/LIB;"
- "%b/MOD;"
- "%r/LIB;"
-- "%r/../LIB;"
- "%d/LIB;"
-- "%d/../LIB"
- ""},
-- {"Singular", 'S', feResBinary,"SINGULAR_EXECUTABLE", "%d/"S_UNAME"/Singular",(char *)""},
-- {"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "%d/"S_UNAME, (char *)""},
-- {"RootDir", 'r', feResDir, "SINGULAR_ROOT_DIR", "%b/..", (char *)""},
-+ {"Singular", 'S', feResBinary,"SINGULAR_EXECUTABLE", "%b/Singular",(char *)S_ROOT_DIR "/Singular"},
-+ {"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "%r", (char *)""},
-+ {"RootDir", 'r', feResDir, "SINGULAR_ROOT_DIR", S_ROOT_DIR, (char *)""},
- {"DefaultDir",'d', feResDir, "SINGULAR_DEFAULT_DIR", SINGULAR_DEFAULT_DIR, (char *)""},
- {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%r/info/singular.hlp", (char *)""},
- {"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%r/doc/singular.idx", (char *)""},
-@@ -95,8 +93,8 @@ static feResourceConfig_s feResourceConfigs[] =
- {"Path", 'p', feResPath, NULL, "%b;$PATH", (char *)""},
-
- #ifdef ESINGULAR
-- {"emacs", 'E', feResBinary,"ESINGULAR_EMACS", "%b/emacs", (char *)""},
-- {"xemacs", 'A', feResBinary,"ESINGULAR_EMACS", "%b/xemacs", (char *)""},
-+ {"emacs", 'E', feResBinary,"ESINGULAR_EMACS", "/usr/bin/emacs", (char *)""},
-+ {"xemacs", 'A', feResBinary,"ESINGULAR_EMACS", "/usr/bin/xemacs", (char *)""},
- {"SingularEmacs",'M', feResBinary,"ESINGULAR_SINGULAR", "%b/Singular", (char *)""},
- {"EmacsLoad", 'l', feResFile, "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular", (char *)""},
- {"EmacsDir", 'e', feResDir, "ESINGULAR_EMACS_DIR", "%r/emacs", (char *)""},
-@@ -105,7 +103,7 @@ static feResourceConfig_s feResourceConfigs[] =
- #ifdef ix86_Win
- {"rxvt", 'X', feResBinary,"RXVT", "%b/rxvt", (char *)""},
- #else
-- {"xterm", 'X', feResBinary,"XTERM", "%b/xterm", (char *)""},
-+ {"xterm", 'X', feResBinary,"XTERM", "/usr/bin/x-terminal-emulator", (char *)""},
- #endif
- #else
- {"EmacsDir", 'e', feResDir, "SINGULAR_EMACS_DIR", "%r/emacs", (char *)""},
diff --git a/debian/patches/0004-mark-hidden-sub-makes-in-doc.patch b/debian/patches/0004-mark-hidden-sub-makes-in-doc.patch
new file mode 100644
index 0000000..1ffda3a
--- /dev/null
+++ b/debian/patches/0004-mark-hidden-sub-makes-in-doc.patch
@@ -0,0 +1,40 @@
+From c18431b10fd3f10073a635367ee753ffb7cfc8c8 Mon Sep 17 00:00:00 2001
+From: "Bernhard R. Link" <brlink at debian.org>
+Date: Sat, 3 Mar 2012 10:24:38 +0100
+Subject: mark hidden sub makes in doc
+
+Add a + before commands invoking sub makes in doc/Makefile.in to
+avoid jobserver warnings.
+
+Bug: http://www.singular.uni-kl.de:8002/trac/ticket/410
+Applied-Upstream: https://github.com/Singular/Sources/commit/872f462d48b65926858bc2ef7f710304d026a619
+---
+ doc/Makefile.in | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/doc/Makefile.in b/doc/Makefile.in
+index 7482778..fd033da 100644
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -185,17 +185,17 @@ usercard.ps: usercard.dvi
+ # texinfo targets
+ #
+ manual.tex: ${MANUAL_FILES} doc2tex.pl ${SINGULAR} singular.doc $(STANDALONE_TEXI_FILES)
+- ${DOC2TEX} -no_fun -o manual.tex singular.doc
++ +${DOC2TEX} -no_fun -o manual.tex singular.doc
+
+ singular.tex: ${MANUAL_FILES} doc2tex.pl ${LIB_TEX_FILES} ${SINGULAR} ${LIBPARSE} singular.doc $(STANDALONE_TEXI_FILES)
+- ${DOC2TEX} -o singular.tex singular.doc
++ +${DOC2TEX} -o singular.tex singular.doc
+
+ #pattern rule for tex files
+ %_noEx.tex : %.doc doc2tex.pl ${SINGULAR}
+- ${DOC2TEX} -o $@ -no_ex $<
++ +${DOC2TEX} -o $@ -no_ex $<
+
+ %.tex: %.doc doc2tex.pl ${SINGULAR}
+- ${DOC2TEX} -o $@ $<
++ +${DOC2TEX} -o $@ $<
+
+ # pattern rules for lib docus
+ ${DOC_SUBDIR}/%_lib.pl : ${SINGULAR_LIB_DIR}/%.lib ${LIBPARSE}
diff --git a/debian/patches/0005-append-suffix-to-soname.patch b/debian/patches/0005-append-suffix-to-soname.patch
deleted file mode 100644
index 2e853b2..0000000
--- a/debian/patches/0005-append-suffix-to-soname.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 12a9979488d2711c4fad7db9dade99bf5f9060df Mon Sep 17 00:00:00 2001
-From: "Bernhard R. Link" <brlink at debian.org>
-Date: Sun, 19 Feb 2012 21:25:54 +0100
-Subject: append suffix to soname
-
-based on old patch most likely from sage,
-but merged with upstream changes and not using "`",
-as make does not know about the embedded spaces...
----
- Singular/Makefile.in | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/Singular/Makefile.in b/Singular/Makefile.in
-index 3bc2c32..3448874 100644
---- a/Singular/Makefile.in
-+++ b/Singular/Makefile.in
-@@ -136,7 +136,8 @@ LIBSINGULAR_LIBS =-lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc
-
- SO_SUFFIX = so
-
--LIBSINGULAR_FLAGS = -shared
-+LIBSINGULAR_FLAGS = -shared -Wl,-soname='$(LIBSINGULAR_NAME)'
-+LIBSINGULAR_NAME = libsingular-$(shell cat ../VERSION).so
- LIBSINGULAR_LD = $(CXX)
-
- # correct suffix for dynamic linking
-@@ -149,6 +150,7 @@ endif
-
- ifeq ($(SINGUNAME),x86_64Mac-darwin)
- SO_SUFFIX = dylib
-+LIBSINGULAR_NAME = libsingular.dylib
- MODULE_SUFFIX = bundle
- LIBSINGULAR_FLAGS = -single_module
- LIBSINGULAR_LD = $(LD)
-@@ -157,6 +159,7 @@ endif
- ifeq ($(SINGUNAME),ppcMac-darwin)
- MACOSX_DEPLOYMENT_TARGET=10.4
- SO_SUFFIX = dylib
-+LIBSINGULAR_NAME = libsingular.dylib
- MODULE_SUFFIX = bundle
- LIBSINGULAR_FLAGS = -single_module
- LIBSINGULAR_LD = $(LD)
-@@ -165,6 +168,7 @@ endif
- ifeq ($(SINGUNAME),ix86-Win)
- SO_SUFFIX = dll
- MODULE_SUFFIX = dll
-+LIBSINGULAR_NAME = libsingular.dll
- LIBSINGULAR_FLAGS = -shared
- LIBSINGULAR_LIBS = -lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc -lhtmlhelp
- endif
diff --git a/debian/patches/0005-tag-gfan-using-examples.patch b/debian/patches/0005-tag-gfan-using-examples.patch
new file mode 100644
index 0000000..0058c56
--- /dev/null
+++ b/debian/patches/0005-tag-gfan-using-examples.patch
@@ -0,0 +1,447 @@
+From bcdc02f66d874d23b71f7c698a2481581565ac80 Mon Sep 17 00:00:00 2001
+From: "Bernhard R. Link" <brlink at debian.org>
+Date: Sat, 3 Mar 2012 10:17:51 +0100
+Subject: tag gfan using examples
+
+Tag all examples in cones.doc, so that the manual can be built
+even if compiled without gfan support.
+---
+ doc/cones.doc | 96 ++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 48 insertions(+), 48 deletions(-)
+
+diff --git a/doc/cones.doc b/doc/cones.doc
+index 0a6b855..944d2f1 100644
+--- a/doc/cones.doc
++++ b/doc/cones.doc
+@@ -53,7 +53,7 @@ vectors of L is the lineality space of the cone,
+ if either bit is 0, then program computes the information itself.
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ // Let's define a cone in R^3 generated by the following half lines:
+ intmat HL[5][3]=
+ 1,0, 0,
+@@ -115,7 +115,7 @@ if lower bit is 1, then program assumes the kernel of E is the span of the cone,
+ if either bit is 0, then program computes the information itself.
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ // Let's define a cone in R^3 given by the following inequalities:
+ intmat IE[6][3]=
+ 1,3,5,
+@@ -176,7 +176,7 @@ if lower bit is 1, then program assumes the kernel of E is the span of the cone,
+ if either bit is 0, then program computes the information itself.
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[11][3]=
+ 0,-1,1,
+ -1,1,0,
+@@ -251,7 +251,7 @@ cone
+ canonicalized version of the cone, no more redundant inequalities and equations
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[11][3]=
+ 0,-1,1,
+ -1,1,0,
+@@ -284,7 +284,7 @@ cone
+ local version of the given cone around the given point of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[3][3]=
+ 1,0,0,
+ 0,1,0,
+@@ -316,7 +316,7 @@ int
+ 1 iff c1 entirely contains c2 resp. iff c contains the given point, possibly on one of its facets; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][2]=
+ 1,0,
+ 0,1;
+@@ -353,7 +353,7 @@ int
+ 1 iff the cone contains a point with positive coordinates in its relative interior; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,1,
+ 1,-1;
+@@ -381,7 +381,7 @@ int
+ 1 iff the given cone contains the given point in its relative interior; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][2]=
+ 1,0,
+ 0,1;
+@@ -409,7 +409,7 @@ int
+ ambient dimension of the cone;
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -439,7 +439,7 @@ int
+ codimension of the cone;
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[1][2]=
+ 1,0;
+ cone c1=coneViaRays(M1);
+@@ -467,7 +467,7 @@ int
+ dimension of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[1][2]=
+ 1,0;
+ cone c1=coneViaRays(M1);
+@@ -493,7 +493,7 @@ cone
+ the dual of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -526,7 +526,7 @@ intmat
+ equations given by the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -556,7 +556,7 @@ intmat
+ inner normal vectors of the facets of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -586,7 +586,7 @@ intmat
+ generating vectors of the lineality space of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[5][3]=
+ 1,0,0,
+ 0,1,0,
+@@ -613,7 +613,7 @@ intmat
+ generating vectors of the span of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[3][5]=
+ 1,0,0,0,0,
+ 0,1,0,0,0,
+@@ -638,7 +638,7 @@ intmat
+ generating vectors of the orthogonal complement of the span of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[3][5]=
+ 1,0,0,0,0,
+ 0,1,0,0,0,
+@@ -663,7 +663,7 @@ intmat
+ inequalities given by the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -693,7 +693,7 @@ int
+ dimension of the lineality space of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[3][3]=
+ 1,0,0,
+ 0,1,0,
+@@ -724,7 +724,7 @@ cone
+ the lineality space of the cone as a new cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[3][3]=
+ 1,0,0,
+ 0,1,0,
+@@ -758,7 +758,7 @@ intvec
+ linear forms of the cone (can be set by setLinearForms); returns empty intmat if not set
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][3]=
+ -1,0,0,
+ 0,-1,0;
+@@ -785,7 +785,7 @@ int
+ multiplicity of the cone (can be set by setMultiplicity); returns 1 if not set
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][3]=
+ -1,0,0,
+ 0,-1,0;
+@@ -810,7 +810,7 @@ cone
+ the negated (or negative) of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][2]=
+ 1,0,
+ 0,1;
+@@ -835,7 +835,7 @@ int
+ quotient of Z^n intersected with the span of the cone with Z^n intersected with its lineality space
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[3][2]=
+ 1,0,
+ 0,1,
+@@ -860,7 +860,7 @@ intmat
+ rays of the cone outside the lineality space, rays inside the lineality space will be ignored
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -891,7 +891,7 @@ intvec
+ point in the relative interior of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -919,7 +919,7 @@ intvec
+ if getDimension(c)=getLinealityDimension(c)+1, then the quotient lattice of Z^n intersected with the span and Z^n intersected with the lineality space is Z^1 and the class of the cone is a semigroup. returns a generator of that semigroup. (like getQuotientLatticeBasis(cone c), but as intvec)
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[3][2]=
+ 1,0,
+ 0,1,
+@@ -943,7 +943,7 @@ intvec
+ special-purpose interior point which supports recognition of symmetries among non-intersecting cones (used in implementation of fans)
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -971,7 +971,7 @@ int
+ 1 iff c1 contains c2 as a face; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][2]=
+ 1,0,
+ 0,1;
+@@ -1001,7 +1001,7 @@ cone
+ the intersection of the two cones
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -1040,7 +1040,7 @@ int
+ 1 iff the cone is the entire ambient space; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ cone c1;
+ isFullSpace(c1);
+ intmat M2[2][2]=
+@@ -1072,7 +1072,7 @@ int
+ 1 iff the cone is just the origin of the ambient space; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ cone c1; // full cone in zero-dimensional ambient space
+ isOrigin(c1);
+ intmat M2[2][2]=
+@@ -1105,7 +1105,7 @@ int
+ 1 iff the cone resp. fan is simplicial; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[3][3]=
+ 1,0,0,
+ 0,1,0,
+@@ -1154,7 +1154,7 @@ isSimplicial(f);
+ adds the information of a linear form to the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][3]=
+ -1,0,0,
+ 0,-1,0;
+@@ -1180,7 +1180,7 @@ getLinearForms(c);
+ adds the information of a multiplicity to the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][3]=
+ -1,0,0,
+ 0,-1,0;
+@@ -1321,7 +1321,7 @@ cone
+ 1 iff c is contained in the collection of cones that is f; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=emptyFan(2);
+ intmat M[2][2]=
+ 1,0,
+@@ -1347,7 +1347,7 @@ cone
+ cone (orbit=0) or orbit (orbit=1) of a certain index (ranges from 1 to numberOfConesOfDimension(f,2,0,0)) in a given dimension; if maximal=0, all cones and orbits are considered, if maximal=1, only maximal cones and orbits are considered
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[3][3]=
+ 1,0,0,
+ 0,1,0,
+@@ -1375,7 +1375,7 @@ none
+ inserts the cone into the fan, checks for compatibility beforehand
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=emptyFan(3);
+ f;
+ intmat M[3][3]=
+@@ -1403,7 +1403,7 @@ int
+ 1 iff cone is compatible with the fan; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=emptyFan(3);
+ intmat M1[3][3]=
+ 1,0,0,
+@@ -1441,7 +1441,7 @@ isCompatible(f,c3);
+ @c 1 iff the fan is complete; 0 otherwise
+ @c @item @strong{Example:}
+ @c @smallexample
+- at c @c example
++ at c @c example tag:gfan
+ @c fan f=fullFan(2);
+ @c isComplete(f);
+ @c fan g=emptyFan(2);
+@@ -1481,7 +1481,7 @@ int
+ 1 iff the fan is pure; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=fullFan(2);
+ isPure(f);
+ fan g=emptyFan(2);
+@@ -1513,7 +1513,7 @@ int
+ number of maximal cones in f
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=emptyFan(3);
+ nmaxcones(f);
+ intmat M1[3][3]=
+@@ -1546,7 +1546,7 @@ int
+ number of cones in f
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=emptyFan(3);
+ ncones(f);
+ intmat M1[3][3]=
+@@ -1579,7 +1579,7 @@ int
+ number of cones (orbit=0) or orbits (orbit=1) of a given dimension; if maximal=0, then all cones are considered, if maximal=1, only maximal cones are considered
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=emptyFan(3);
+ ncones(f);
+ intmat M[3][3]=
+@@ -1613,7 +1613,7 @@ none
+ inserts the cone into the fan, no checking of compatibility
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=emptyFan(3);
+ f;
+ intmat M[3][3]=
+@@ -1666,7 +1666,7 @@ a vertex of the polytope,
+ if flags is 0, then program computes the information itself.
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ // Let's a polytope in R^2 generated by:
+ intmat V[4][3]=
+ 1,0,0,
+@@ -1707,7 +1707,7 @@ if lower bit is 1, then program assumes the kernel of E is the span of the cone,
+ if either bit is 0, then program computes the information itself.
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat IE[2][3]=
+ 1,0,0,
+ 0,1,0;
+@@ -1752,7 +1752,7 @@ intmat
+ vertices of p
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[4][3]=
+ 1,0,0,
+ 1,2,0,
diff --git a/debian/patches/0006-add-working-all-target-to-Makefile.in.patch b/debian/patches/0006-add-working-all-target-to-Makefile.in.patch
deleted file mode 100644
index 0010565..0000000
--- a/debian/patches/0006-add-working-all-target-to-Makefile.in.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From a4fb40d6cd6c62cf29ad6a4f8e5c3a029da07a39 Mon Sep 17 00:00:00 2001
-From: Felix Salfelder <felix at salfelder.org>
-Date: Thu, 16 Feb 2012 11:07:25 +0100
-Subject: add working 'all' target to Makefile.in
-
-now 'make\ {all,install}' works as usual and expected
----
- Makefile.in | 14 +++++++++-----
- 1 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 8e78512..3797c90 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -24,8 +24,12 @@ GUNZIP = @GUNZIP@
-
- ##############################################################
- # default target
--${SINGULAR}:
-- ${MAKE} install
-+all:
-+ @ for SUBDIR in ${BUILD1_SUBDIRS}; \
-+ do \
-+ echo ${MAKE} all in $${SUBDIR}; \
-+ ${MAKE} -C $$SUBDIR || exit 1; \
-+ done
-
- ##############################################################
- # general targets
-@@ -34,7 +38,7 @@ ${SINGULAR}:
-
- TEXINFO_TEX_FILES = epsf.tex texinfo.tex txi-cs.tex txi-de.tex txi-no.tex
- TEXINFO_TEX_DIR = Texinfo/doc
--all:
-+original_all:
- echo For everybody who did not read the README: use make install
- exit 1
-
-@@ -42,7 +46,7 @@ install install_all:
- @ for SUBDIR in ${BUILD1_SUBDIRS}; \
- do \
- echo ${MAKE} $@ in $${SUBDIR}; \
-- (cd $${SUBDIR} && ${MAKE} $@ ) || exit 1;\
-+ ${MAKE} -C $$SUBDIR $@ || exit 1 ;\
- (if test "$${SUBDIR}" = Texinfo && test -d doc; then \
- for FILE in ${TEXINFO_TEX_FILES}; \
- do \
-@@ -62,7 +66,7 @@ install-nolns:
- @ for SUBDIR in ${BUILD1_SUBDIRS}; \
- do \
- echo ${MAKE} $@ in $${SUBDIR}; \
-- (cd $${SUBDIR} && ${MAKE} $@ ) || exit 1;\
-+ ${MAKE} -C $$SUBDIR $@ ;\
- (if test "$${SUBDIR}" = Texinfo && test -d doc; then \
- for FILE in ${TEXINFO_TEX_FILES}; \
- do \
diff --git a/debian/patches/0006-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch b/debian/patches/0006-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
new file mode 100644
index 0000000..06a2618
--- /dev/null
+++ b/debian/patches/0006-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
@@ -0,0 +1,344 @@
+From 1132ca05e1003cc6bf9aaec92b8914eb2cc52e99 Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Thu, 16 Feb 2012 08:45:58 +0100
+Subject: use $DESTDIR as a pre-prefix, in install* targets
+
+---
+ IntegerProgramming/Makefile.in | 12 +++---
+ Singular/Makefile.in | 85 ++++++++++++++++++----------------------
+ factory/GNUmakefile.in | 25 ++++++------
+ kernel/Makefile.in | 20 +++++-----
+ libfac/Makefile.in | 14 +++---
+ omalloc/Makefile.in | 22 +++++-----
+ 6 files changed, 85 insertions(+), 93 deletions(-)
+
+diff --git a/IntegerProgramming/Makefile.in b/IntegerProgramming/Makefile.in
+index 5b5b5e6..0c6e6af 100644
+--- a/IntegerProgramming/Makefile.in
++++ b/IntegerProgramming/Makefile.in
+@@ -57,12 +57,12 @@ install-nolns: install
+ install_all: install
+
+ install install-libsingular: $(MAIN1) $(MAIN2) $(MAIN3) $(MAIN4) $(LLL)
+- ${MKINSTALLDIRS} ${bindir}
+- ${INSTALL_PROGRAM} $(MAIN1) ${bindir}
+- ${INSTALL_PROGRAM} $(MAIN2) ${bindir}
+- ${INSTALL_PROGRAM} $(MAIN3) ${bindir}
+- ${INSTALL_PROGRAM} $(MAIN4) ${bindir}
+- ${INSTALL_PROGRAM} $(LLL) ${bindir}
++ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} $(MAIN1) $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} $(MAIN2) $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} $(MAIN3) $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} $(MAIN4) $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} $(LLL) $(DESTDIR)${bindir}
+
+ install-bindist: $(MAIN1) $(MAIN2) $(MAIN3) $(MAIN4)
+ ${MKINSTALLDIRS} ${install_bindir}
+diff --git a/Singular/Makefile.in b/Singular/Makefile.in
+index c6a3ecb..8f004e6 100644
+--- a/Singular/Makefile.in
++++ b/Singular/Makefile.in
+@@ -560,51 +560,42 @@ install_all: install
+ install-nolns: all installbin-nolns installslib-nolns
+
+ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
+- ${MKINSTALLDIRS} ${bindir}
+- ${INSTALL_PROGRAM} ${SING_EXEC} ${SINGULAR}
++ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${SINGULAR}
+ -for file in *.so; do \
+- ${INSTALL_PROGRAM} $$file ${bindir}; \
++ ${INSTALL_PROGRAM} $$file $(DESTDIR)${bindir}; \
+ done
+- ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} ${bindir}
+- ${INSTALL_PROGRAM} ESingular TSingular ${bindir}
+- ${INSTALL_PROGRAM} surfex ${bindir}
+- chmod a+x ${SINGULAR}
+- rm -f ${bindir}/${SING_EXEC}${EXEC_EXT}
+- cd ${bindir}; ${LN_S} ${SINGULAR} Singular${EXEC_EXT};
+-
+-installbin-nolns: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
+- ${MKINSTALLDIRS} ${bindir}
+- ${INSTALL_PROGRAM} ${SING_EXEC} ${SINGULAR}
+- -for file in *.so; do \
+- ${INSTALL_PROGRAM} $$file ${bindir}; \
+- done
+- ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} ${bindir}
+- ${INSTALL_PROGRAM} ESingular TSingular ${DL_LIBS} ${bindir}
+- chmod a+x ${SINGULAR}
+- rm -f ${bindir}/${SING_EXEC}${EXEC_EXT}
+- ${INSTALL_PROGRAM} ${SINGULAR} ${bindir}/Singular${EXEC_EXT};
++ ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} ESingular TSingular $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} surfex $(DESTDIR)${bindir}
++ chmod a+x $(DESTDIR)${SINGULAR}
++ rm -f $(DESTDIR)${bindir}/${SING_EXEC}${EXEC_EXT}
++ cd $(DESTDIR)${bindir}; ${LN_S} ${SINGULAR} Singular${EXEC_EXT};
++
++installbin-nolns: installbin
++ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${install_bindir}/Singular${EXEC_EXT};
+
+ installslib: LIB
+ test -r ${slibdir} || ${LN_S} `pwd`/LIB ${slibdir}
+
+ installslib-nolns: LIB
+- ${MKINSTALLDIRS} ${slibdir}
++ ${MKINSTALLDIRS} $(DESTDIR)${slibdir}
+ for file in `pwd`/LIB/*.lib; do \
+- ${INSTALL_DATA} $$file ${slibdir}; \
++ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
+ done
+- ${MKINSTALLDIRS} ${slibdir}/gftables
++ ${MKINSTALLDIRS} $(DESTDIR)${slibdir}/gftables
+ for file in `pwd`/LIB/gftables/*; do \
+- ${INSTALL_DATA} $$file ${slibdir}/gftables/; \
++ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
+ done
+
+ install-libsingular: libsingular
+- ${MKINSTALLDIRS} ${includedir}/singular
++ ${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
+ for file in *.$(SO_SUFFIX); do \
+- ${INSTALL_PROGRAM} $$file ${libdir}; \
++ ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
+ done
+- ${INSTALL_PROGRAM} libsingular.h ${includedir}
++ ${INSTALL_PROGRAM} libsingular.h $(DESTDIR)${includedir}
+ for file in subexpr.h tok.h grammar.h ipid.h lists.h ipshell.h attrib.h; do \
+- sed -e "s:<kernel/:<singular/:" < $$file |sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" >${includedir}/singular/$$file ;\
++ sed -e "s:<kernel/:<singular/:" < $$file |sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" >$(DESTDIR)${includedir}/singular/$$file ;\
+ done
+
+ uninstall: uninstallbin
+@@ -654,23 +645,23 @@ LIB/all.lib: LIB/all.lib.tmpl
+
+ install-bindist: $(HEADERS) $(SOURCES) Makefile depend
+ echo "#define MAKE_DISTRIBUTION " > distrib.h
+- sleep 1
+- ${MAKE} ${SING_EXEC} ESingular TSingular libparse ${RUN_SINGULARS}
+- ${MKINSTALLDIRS} ${install_bindir}
+- ${INSTALL_PROGRAM} ${SING_EXEC} ${install_bindir}/Singular
+- -${INSTALL_PROGRAM} *.so ${install_bindir}
+- ${INSTALL_PROGRAM} -s libparse ${RUN_SINGULARS} ESingular TSingular ${install_bindir}
+- ${INSTALL_PROGRAM} surfex ${install_bindir}
++ # sleep 1
++ ${MAKE} ${SING_EXEC} ESingular TSingular libparse $(DESTDIR)${RUN_SINGULARS}
++ ${MKINSTALLDIRS} $(DESTDIR)${install_bindir}
++ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${install_bindir}/Singular
++ -${INSTALL_PROGRAM} *.so $(DESTDIR)${install_bindir}
++ ${INSTALL_PROGRAM} -s libparse ${RUN_SINGULARS} ESingular TSingular $(DESTDIR)${install_bindir}
++ ${INSTALL_PROGRAM} surfex $(DESTDIR)${install_bindir}
+ echo "#undef MAKE_DISTRIBUTION " > distrib.h
+
+ install-sharedist: ${SLIBS_FILES} LIB/gftables
+- ${MKINSTALLDIRS} ${install_slibdir}
+- cp ${SLIBS_FILES} ${install_slibdir}
+- ${MKINSTALLDIRS} ${install_slibdir}/gftables
+- cp ${GFTABLES} ${install_slibdir}/gftables
+- ${MKINSTALLDIRS} ${install_slibdir}/surfex
+- cp LIB/surfex/surfex.jar ${install_slibdir}/surfex
+- chmod -R +rX ${install_slibdir}/*
++ ${MKINSTALLDIRS} $(DESTDIR)${install_slibdir}
++ cp ${SLIBS_FILES} $(DESTDIR)${install_slibdir}
++ ${MKINSTALLDIRS} $(DESTDIR)${install_slibdir}/gftables
++ cp ${GFTABLES} $(DESTDIR)${install_slibdir}/gftables
++ ${MKINSTALLDIRS} $(DESTDIR)${install_slibdir}/surfex
++ cp LIB/surfex/surfex.jar $(DESTDIR)${install_slibdir}/surfex
++ chmod -R +rX $(DESTDIR)${install_slibdir}/*
+
+ tar:
+ tar cf Singular-${SINGULAR_VERSION}-src.tar ${DISTFILES}
+@@ -768,8 +759,8 @@ mpsr_Tok.og: iparith.inc mpsr_Tok.cc
+ $(CXXG) ${CXXFLAGSG} ${CPPFLAGS} ${CXXTEMPLFLAGSG} ${DEFSG} -c mpsr_Tok.cc -o mpsr_Tok.og
+
+ installg: Singularg
+- ${MKINSTALLDIRS} ${bindir}
+- ${INSTALL_PROGRAM} Singularg ${bindir}
++ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} Singularg $(DESTDIR)${bindir}
+
+ ESingularg: mod2.h feOpt.cc version.h emacs.cc \
+ feOptES.inc
+@@ -848,8 +839,8 @@ mpsr_Tok.op: iparith.inc mpsr_Tok.cc
+ $(CXXP) ${CXXFLAGSP} ${CPPFLAGS} ${CXXTEMPLFLAGSP} ${DEFSP} -c mpsr_Tok.cc -o mpsr_Tok.op
+
+ installp: Singularp
+- ${MKINSTALLDIRS} ${bindir}
+- ${INSTALL_PROGRAM} Singularp ${bindir}
++ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} Singularp $(DESTDIR)${bindir}
+
+ ##
+ ## dependencies
+diff --git a/factory/GNUmakefile.in b/factory/GNUmakefile.in
+index ad1dcf1..1e8d80d 100644
+--- a/factory/GNUmakefile.in
++++ b/factory/GNUmakefile.in
+@@ -642,21 +642,22 @@ install_all: install libsingcf_p.a
+ install-nolns: install
+
+ installcf: cf
+- $(MKINSTALLDIRS) $(libdir)
+- $(MKINSTALLDIRS) $(includedir)
+- $(MKINSTALLDIRS) $(templatedir)
+- $(INSTALL_DATA) $(libfactory) $(libdir)/$(libfactory)
+- -$(INSTALL_DATA) libsingcf_g.a $(libdir)/libsingcf_g.a
+- -$(INSTALL_DATA) libsingcf_p.a $(libdir)/libsingcf_p.a
+- $(INSTALL_DATA) factory.h $(includedir)/factory.h
+- $(INSTALL_DATA) cf_gmp.h $(includedir)/cf_gmp.h
+- $(INSTALL_DATA) factoryconf.h $(includedir)/factoryconf.h
+- $(INSTALL_DATA) $(srcdir)/ftmpl_inst.cc $(templatedir)/ftmpl_inst.cc
++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(includedir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(templatedir)
++ $(INSTALL_DATA) $(libfactory) $(DESTDIR)$(libdir)/$(libfactory)
++ -$(INSTALL_DATA) libsingcf_g.a $(DESTDIR)$(libdir)/libsingcf_g.a
++ -$(INSTALL_DATA) libsingcf_p.a $(DESTDIR)$(libdir)/libsingcf_p.a
++ $(INSTALL_DATA) factory.h $(DESTDIR)$(includedir)/factory.h
++ $(INSTALL_DATA) cf_gmp.h $(DESTDIR)$(includedir)/factory/cf_gmp.h
++ $(INSTALL_DATA) factoryconf.h $(DESTDIR)$(includedir)/factory/factoryconf.h
++ # FIXME: what is templatedir?
++ $(INSTALL_DATA) $(srcdir)/ftmpl_inst.cc $(DESTDIR)$(templatedir)/ftmpl_inst.cc
+ for file in $(templatesrc) $(templateincl); do \
+- $(INSTALL_DATA) $(srcdir)/templates/$$file $(templatedir)/$$file; \
++ $(INSTALL_DATA) $(srcdir)/templates/$$file $(DESTDIR)$(templatedir)/$$file; \
+ done
+ # we run `ranlib' another time for SUN machines
+- $(RANLIB) $(libdir)/$(libfactory)
++ $(RANLIB) $(DESTDIR)$(libdir)/$(libfactory)
+
+ installmem: mem
+ $(MKINSTALLDIRS) $(libdir)
+diff --git a/kernel/Makefile.in b/kernel/Makefile.in
+index 13db562..7b8b77b 100644
+--- a/kernel/Makefile.in
++++ b/kernel/Makefile.in
+@@ -48,7 +48,7 @@ PIPE = @PIPE@
+ CFLAGS = @CFLAGS@ ${PIPE}
+ CXXFLAGS = @CXXFLAGS@ ${PIPE}
+ CXXTEMPLFLAGS = @CXXTEMPLFLAGS@
+-CPPFLAGS = -I${srcdir} -I.. -I at prefix@ @CPPFLAGS@
++CPPFLAGS = -I${srcdir} -I.. -I at prefix@ @CPPFLAGS@
+ DEFS = -DNDEBUG -DOM_NDEBUG -D at SING_UNAME@ @DEFS@
+ LDFLAGS = @LDFLAGS@
+ LD_DYN_FLAGS = @LD_DYN_FLAGS@
+@@ -236,7 +236,7 @@ libkernel.a: ${OBJS}
+ -rm -f libkernel.a
+ ar cr $@ $^
+
+-p_Procs_Lib.o: p_Procs_Lib.inc
++p_Procs_Lib.o: p_Procs_Dynamic.inc
+
+ # Hmm compiling with -fomit-frame-pointer resulted in access violation
+ # under cygwin
+@@ -253,12 +253,12 @@ p_Procs_Dynamic.o p_Procs_Lib.o p_Procs_Dynamic.og p_Procs_Lib.og\
+ p_Procs_Dynamic.inc p_Procs_Lib.inc: p_Procs_Dynamic.h
+
+ # here is how p_Procs_[Static|Dynamic].inc is generated
+-p_Procs_Static.inc: p_Procs_Generate.cc p_Procs_Impl.h mod2.h
++p_Procs_Static.inc: p_Procs_Generate.cc p_Procs_Impl.h |mod2.h
+ $(CXX) $(CPPFLAGS) -g -Dp_Procs_Static p_Procs_Generate.cc -o p_Procs_Static
+ ./p_Procs_Static > p_Procs_Static.xx && mv p_Procs_Static.xx p_Procs_Static.inc
+ -rm -f p_Procs_Static p_Procs_Static.exe
+
+-p_Procs_Dynamic.inc: p_Procs_Generate.cc p_Procs_Impl.h mod2.h
++p_Procs_Dynamic.inc: p_Procs_Generate.cc p_Procs_Impl.h |mod2.h
+ $(CXX) $(CPPFLAGS) -g -Dp_Procs_Dynamic p_Procs_Generate.cc -o p_Procs_Dynamic
+ ./p_Procs_Dynamic > p_Procs_Dynamic.xx && mv p_Procs_Dynamic.xx p_Procs_Dynamic.inc
+ -rm -f p_Procs_Dynamic p_Procs_Dynamic.exe
+@@ -272,9 +272,9 @@ p_Procs_%.so: p_Procs_Lib_%.dl_o
+ install-nolns: install
+
+ install-libsingular: install
+- -${MKINSTALLDIRS} ${includedir}
+- -${MKINSTALLDIRS} ${includedir}/singular
+- -for file in *.h kInline.cc; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > ${includedir}/singular/$$file; done
++ ${MKINSTALLDIRS} $(DESTDIR)${includedir}
++ ${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
++ for file in *.h kInline.cc; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > $(DESTDIR)${includedir}/singular/$$file; done
+
+ install: all installbin
+
+@@ -290,12 +290,12 @@ endif
+
+
+ installbin: ${DL_LIBS} ${DL_LIBSG} libkernel.a libkernel_g.a
+- ${MKINSTALLDIRS} ${bindir}
++ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
+ - ranlib libkernel.a
+ - ranlib libkernel_g.a
+ ifeq (,${DL_LIBS})
+ else
+- -${INSTALL_PROGRAM} ${DL_LIBS} ${bindir}
++ ${INSTALL_PROGRAM} ${DL_LIBS} $(DESTDIR)${bindir}
+ ifeq (,${DL_LIBSG})
+ else
+ -for file in ${DL_LIBS} ${DL_LIBSG}; do ${INSTALL_PROGRAM} $$file ../Singular; done
+@@ -307,7 +307,7 @@ install-bindist: ${DL_LIBS} libkernel.a
+ ${MKINSTALLDIRS} ${bindir}
+ ifeq (,${DL_LIBS})
+ else
+- -${INSTALL_PROGRAM} ${DL_LIBS} ${bindir}
++ ${INSTALL_PROGRAM} ${DL_LIBS} $(DESTDIR)${bindir}
+ endif
+
+ ##
+diff --git a/libfac/Makefile.in b/libfac/Makefile.in
+index ef7bc5a..62faadb 100644
+--- a/libfac/Makefile.in
++++ b/libfac/Makefile.in
+@@ -147,13 +147,13 @@ libsingfac_p.a: $(PROFOBJ)
+ install-nolns: install
+
+ install install-libsingular: all
+- ${MKINSTALLDIRS} ${includedir}
+- ${MKINSTALLDIRS} ${libdir}
+- ${INSTALL_DATA} ${LIBFACINCLUDE} ${includedir}
+- ${INSTALL_DATA} ${TARGETNAME}.a ${libdir}
+- -${INSTALL_DATA} libsingfac_g.a ${libdir}
+- $(RANLIB) ${libdir}/${TARGETNAME}.a
+- -$(RANLIB) ${libdir}/libsingfac_g.a
++ ${MKINSTALLDIRS} $(DESTDIR)${includedir}
++ ${MKINSTALLDIRS} $(DESTDIR)${libdir}
++ ${INSTALL_DATA} ${LIBFACINCLUDE} $(DESTDIR)${includedir}
++ ${INSTALL_DATA} ${TARGETNAME}.a $(DESTDIR)${libdir}
++ -${INSTALL_DATA} libsingfac_g.a $(DESTDIR)${libdir}
++ $(RANLIB) $(DESTDIR)${libdir}/${TARGETNAME}.a
++ -$(RANLIB) $(DESTDIR)${libdir}/libsingfac_g.a
+
+ install_all: install libsingfac_p.a
+ -${INSTALL_DATA} libsingfac_p.a ${libdir}
+diff --git a/omalloc/Makefile.in b/omalloc/Makefile.in
+index 79cd909..4956179 100644
+--- a/omalloc/Makefile.in
++++ b/omalloc/Makefile.in
+@@ -185,17 +185,17 @@ install-libsingular:
+ $(INSTALL) omalloc.h $(includedir)/singular
+
+ install install-libsingular: all
+- $(MKINSTALLDIRS) $(libdir)
+- $(MKINSTALLDIRS) $(includedir)
+- $(INSTALL_DATA) libomalloc.a $(libdir)
+- $(RANLIB) $(libdir)/libomalloc.a
+- $(INSTALL_DATA) libomalloc_ndebug.a $(libdir)
+- $(RANLIB) $(libdir)/libomalloc_ndebug.a
+- $(INSTALL_DATA) omalloc.o $(libdir)
+- $(INSTALL_DATA) omalloc_debug.o $(libdir)
+- $(INSTALL_DATA) omalloc.h $(includedir)
+- $(INSTALL_DATA) omlimits.h $(includedir)
+- $(INSTALL_DATA) mylimits.h $(includedir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(includedir)
++ $(INSTALL_DATA) libomalloc.a $(DESTDIR)$(libdir)
++ $(RANLIB) $(DESTDIR)$(libdir)/libomalloc.a
++ $(INSTALL_DATA) libomalloc_ndebug.a $(DESTDIR)$(libdir)
++ $(RANLIB) $(DESTDIR)$(libdir)/libomalloc_ndebug.a
++ $(INSTALL_DATA) omalloc.o $(DESTDIR)$(libdir)
++ $(INSTALL_DATA) omalloc_debug.o $(DESTDIR)$(libdir)
++ $(INSTALL_DATA) omalloc.h $(DESTDIR)$(includedir)
++ $(INSTALL_DATA) omlimits.h $(DESTDIR)$(includedir)
++ $(INSTALL_DATA) mylimits.h $(DESTDIR)$(includedir)
+
+ install_all: install libomalloc_p.a
+ $(INSTALL_DATA) libomalloc_p.a $(libdir)
diff --git a/debian/patches/0007-add-working-all-target-to-Makefile.in.patch b/debian/patches/0007-add-working-all-target-to-Makefile.in.patch
new file mode 100644
index 0000000..f482270
--- /dev/null
+++ b/debian/patches/0007-add-working-all-target-to-Makefile.in.patch
@@ -0,0 +1,56 @@
+From 6f30888279821baa8715124aab14bd03f94f7b8f Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Thu, 16 Feb 2012 11:07:25 +0100
+Subject: add working 'all' target to Makefile.in
+
+now 'make\ {all,install}' works as usual and expected
+---
+ Makefile.in | 14 +++++++++-----
+ 1 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 8e78512..3797c90 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -24,8 +24,12 @@ GUNZIP = @GUNZIP@
+
+ ##############################################################
+ # default target
+-${SINGULAR}:
+- ${MAKE} install
++all:
++ @ for SUBDIR in ${BUILD1_SUBDIRS}; \
++ do \
++ echo ${MAKE} all in $${SUBDIR}; \
++ ${MAKE} -C $$SUBDIR || exit 1; \
++ done
+
+ ##############################################################
+ # general targets
+@@ -34,7 +38,7 @@ ${SINGULAR}:
+
+ TEXINFO_TEX_FILES = epsf.tex texinfo.tex txi-cs.tex txi-de.tex txi-no.tex
+ TEXINFO_TEX_DIR = Texinfo/doc
+-all:
++original_all:
+ echo For everybody who did not read the README: use make install
+ exit 1
+
+@@ -42,7 +46,7 @@ install install_all:
+ @ for SUBDIR in ${BUILD1_SUBDIRS}; \
+ do \
+ echo ${MAKE} $@ in $${SUBDIR}; \
+- (cd $${SUBDIR} && ${MAKE} $@ ) || exit 1;\
++ ${MAKE} -C $$SUBDIR $@ || exit 1 ;\
+ (if test "$${SUBDIR}" = Texinfo && test -d doc; then \
+ for FILE in ${TEXINFO_TEX_FILES}; \
+ do \
+@@ -62,7 +66,7 @@ install-nolns:
+ @ for SUBDIR in ${BUILD1_SUBDIRS}; \
+ do \
+ echo ${MAKE} $@ in $${SUBDIR}; \
+- (cd $${SUBDIR} && ${MAKE} $@ ) || exit 1;\
++ ${MAKE} -C $$SUBDIR $@ ;\
+ (if test "$${SUBDIR}" = Texinfo && test -d doc; then \
+ for FILE in ${TEXINFO_TEX_FILES}; \
+ do \
diff --git a/debian/patches/0007-miscellaneous-Makefile-template-patches.patch b/debian/patches/0007-miscellaneous-Makefile-template-patches.patch
deleted file mode 100644
index ccdcc94..0000000
--- a/debian/patches/0007-miscellaneous-Makefile-template-patches.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-From 2c621289709a634b7a345904b9ca6c8652e9752f Mon Sep 17 00:00:00 2001
-From: Felix Salfelder <felix at salfelder.org>
-Date: Thu, 16 Feb 2012 12:37:00 +0100
-Subject: miscellaneous Makefile template patches
-
- - fix flags (mostly search paths)
- - repair default and install targets
- - remove dependency on mod2.h in kernel. "make depend" works fine
----
- Singular/Makefile.in | 55 ++++++++++++++++++++++++++++++-----------------
- emacs/Makefile.in | 5 +++-
- factory/GNUmakefile.in | 18 ++++++++-------
- kernel/Makefile.in | 10 ++++----
- libfac/Makefile.in | 24 ++++++++++----------
- omalloc/Makefile.in | 6 ++--
- 6 files changed, 69 insertions(+), 49 deletions(-)
-
-diff --git a/Singular/Makefile.in b/Singular/Makefile.in
-index 3448874..e4b7530 100644
---- a/Singular/Makefile.in
-+++ b/Singular/Makefile.in
-@@ -85,7 +85,7 @@ endif
- DEFS = -DNDEBUG -DOM_NDEBUG -D at SING_UNAME@ @DEFS@
- LDFLAGS2 = @LDFLAGS@
- ifneq ($(SINGUNAME),ix86-Win)
--LDFLAGS = -L at prefix@/kernel -L../kernel -lkernel @LDFLAGS@
-+LDFLAGS = -L at prefix@/kernel -L../kernel -L../omalloc -L../libfac -L../factory -lkernel @LDFLAGS@
- LDFLAGSG = -L at prefix@/kernel -L../kernel -lkernel_g @LD_DYN_FLAGS1@ @LDFLAGS@
- LDFLAGSP = -L at prefix@/kernel -L../kernel -lkernel_p @LD_DYN_FLAGS1@ @LDFLAGS@
- else
-@@ -362,14 +362,14 @@ GFTABLES = $(wildcard LIB/gftables/[1-9]*)
- fi
-
- .cc.o:
-- ${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} -c $<
-+ ${CXX} -fPIC ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} -c $<
- .c.o:
-- ${CC} ${CFLAGS} ${CPPFLAGS} ${DEFS} -c $<
-+ ${CC} -fPIC ${CFLAGS} ${CPPFLAGS} ${DEFS} -c $<
-
- %.dl_o : %.cc
- ${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} ${SFLAGS} -c $< -o $@
-
--all: $(SING_EXEC)
-+all: $(SING_EXEC) $(LIBSINGULAR_NAME)
-
- Singular-static: version.h
- sleep 1
-@@ -386,11 +386,16 @@ Singular${S_EXT}: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
- tesths.cc iparith.o mpsr_Tok.o claptmpl.o\
- ${OBJS} ${LDFLAGS} ${LIBS} ${LD_DYN_FLAGS} ../kernel/mmalloc.o
-
--libsingular: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
-- iparith.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS)
-- $(LIBSINGULAR_LD) ${SLDFLAGS} ${LIBSINGULAR_FLAGS} -o libsingular.${SO_SUFFIX} \
-- iparith.o mpsr_Tok.o claptmpl.o \
-- ${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L${libdir} ${LIBSINGULAR_LIBS} -ldl
-+libsingular: ${LIBSINGULAR_NAME}
-+
-+${LIBSINGULAR_NAME}: version.h $(WIN_LIBS) scanner.cc ${OBJS} \
-+ iparith.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS) tesths.o
-+ $(LIBSINGULAR_LD) ${SLDFLAGS} ${LIBSINGULAR_FLAGS} -o ${LIBSINGULAR_NAME} \
-+ tesths.o iparith.o mpsr_Tok.o claptmpl.o \
-+ ${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L../omalloc -L${libdir} ${LIBSINGULAR_LIBS}
-+ if [ $(LIBSINGULAR_NAME) != libsingular.$(SO_SUFFIX) ]; then \
-+ ln -fs $(LIBSINGULAR_NAME) libsingular.$(SO_SUFFIX); \
-+ fi
-
- libsingular.a: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
- iparith.o libparse.cc claptmpl.o mpsr_Tok.o
-@@ -426,13 +431,16 @@ iparith.inc: gentable.cc grammar.h tok.h table.h mod2.h
- ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} ${LD_DYN_FLAGS} gentable.cc \
- -o gentable1
- ./gentable1
-- /bin/rm -f gentable1 gentable1.exe
-+ # /bin/rm -f gentable1 gentable1.exe
-
- mpsr_Tok.inc: gentable2.cc grammar.h tok.h table.h mod2.h
- ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} ${LD_DYN_FLAGS} gentable2.cc \
- -o gentable2
- ./gentable2
-- /bin/rm -f gentable2 gentable2.exe
-+ # /bin/rm -f gentable2 gentable2.exe
-+ #
-+ # FIXME: the above doesnt work.
-+ touch $@
-
-
- svnver:
-@@ -476,17 +484,17 @@ TSingular: mod2.h feOpt.cc version.h emacs.cc \
- feOpt.o: feOpt.inc feOptES.inc feOptTS.inc
- extra.o: feOpt.inc
-
--feOpt.inc: feOpt.cc mod2.h
-+feOpt.inc: feOpt.cc |mod2.h
- $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX ${CPPFLAGS} feOpt.cc -o feOpt
- ./feOpt
- /bin/rm -f feOpt feOpt.exe
-
--feOptES.inc: feOpt.cc mod2.h
-+feOptES.inc: feOpt.cc |mod2.h
- $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX -DESINGULAR -I../kernel feOpt.cc -o feOptES
- ./feOptES
- rm -f feOptES feOptES.exe
-
--feOptTS.inc: feOpt.cc mod2.h
-+feOptTS.inc: feOpt.cc |mod2.h
- $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX -DTSINGULAR -I../kernel feOpt.cc -o feOptTS
- ./feOptTS
- rm -f feOptTS feOptTS.exe
-@@ -557,11 +565,11 @@ endif
- ##
- ## install targets
- ##
--install: all installbin installslib
-+install: all installbin installslib install-libsingular
-
- install_all: install
-
--install-nolns: all installbin-nolns installslib-nolns
-+install-ln: all installbin installslib-ln
-
- installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
- ${MKINSTALLDIRS} $(DESTDIR)${bindir}
-@@ -569,6 +577,12 @@ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
- -for file in *.so; do \
- ${INSTALL_PROGRAM} $$file $(DESTDIR)${bindir}; \
- done
-+ ${MKINSTALLDIRS} $(DESTDIR)${install_bindir}
-+ ${MKINSTALLDIRS} $(DESTDIR)${libdir}
-+ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${SINGULAR}
-+ for file in *.so; do \
-+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
-+ done
- ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} $(DESTDIR)${bindir}
- ${INSTALL_PROGRAM} ESingular TSingular $(DESTDIR)${bindir}
- ${INSTALL_PROGRAM} surfex $(DESTDIR)${bindir}
-@@ -579,10 +593,10 @@ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
- installbin-nolns: installbin
- ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${install_bindir}/Singular${EXEC_EXT};
-
--installslib: LIB
-+installslib-ln: LIB
- test -r ${slibdir} || ${LN_S} `pwd`/LIB ${slibdir}
-
--installslib-nolns: LIB
-+installslib: LIB
- ${MKINSTALLDIRS} $(DESTDIR)${slibdir}
- for file in `pwd`/LIB/*.lib; do \
- ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
-@@ -592,7 +606,7 @@ installslib-nolns: LIB
- ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
- done
-
--install-libsingular: libsingular
-+install-libsingular: ${LIBSINGULAR_NAME}
- ${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
- for file in *.$(SO_SUFFIX); do \
- ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
-@@ -615,11 +629,12 @@ uninstallbin:
- mostlyclean:
- -rm -f Singular Singular-static Singularg Singularp libparse feOpt*.inc
- -rm -f *.o *.og core *.op *.so* *.dl_o*
-- -rm -f ESingular* TSingular*
-+ -rm -f ESingular* TSingular* libsingular
-
- clean: mostlyclean
- -rm -f *.bak *.d *.dd depend
- -rm -f ${slibdir}
-+ -rm -f gentable1 gentable2
-
- distclean: clean
- -rm -f iparith.inc mpsr_Tok.inc stamp.h
-diff --git a/emacs/Makefile.in b/emacs/Makefile.in
-index 86ba445..47c57e1 100644
---- a/emacs/Makefile.in
-+++ b/emacs/Makefile.in
-@@ -42,9 +42,12 @@ lib-cmpl.el: ${prefix}/Singular/Makefile lib.pl
- (cd ${prefix}/Singular;${MAKE} --no-print-directory -s -f Makefile echoLIBS) > lib-temp
- ${PERL} lib.pl -s ${singulardir} `cat lib-temp` > lib-cmpl.el
-
--clean mostlyclean distclean:
-+clean mostlyclean:
- rm -f cmd-cmpl.el hlp-cmpl.el lib-cmpl.el ex-cmpl.el
-
-+distclean: mostlyclean
-+ rm -f Makefile
-+
- install-sharedist: all
- ${MKINSTALLDIRS} ${emacsdir}
- ${INSTALL_DATA} cmd-cmpl.el ${emacsdir}
-diff --git a/factory/GNUmakefile.in b/factory/GNUmakefile.in
-index 1e8d80d..c80d6e1 100644
---- a/factory/GNUmakefile.in
-+++ b/factory/GNUmakefile.in
-@@ -455,24 +455,24 @@ distfiles := \
- #
-
- # how to create library objets
--%.o: %.cc config.h factoryconf.h
-+%.o: %.cc config.h |factoryconf.h
- $(CXX) -c $< $(LIBCXXFLAGS) -o $@
- %.o: %.c config.h
- $(CC) -c $< $(LIBCFLAGS) -o $@
- # the debug version:
--%.og: %.cc config.h factoryconf.h
-+%.og: %.cc config.h |factoryconf.h
- $(CXX) -g -c $< $(LIBCGGFLAGS) -o $@
- # the profiling version:
--%.op: %.cc config.h factoryconf.h
-+%.op: %.cc config.h |factoryconf.h
- $(CXX) -O -pg -c $< $(LIBCGGFLAGS) -o $@
-
- # how to create dependency files. To avoid broken dependency files
- # (which in turn break this GNUmakefile) we first generate them in
- # a temporary file which we then move to the destination file.
--%.dtmp: %.cc factoryconf.h config.h
-+%.dtmp: %.cc |factoryconf.h config.h
- echo $*.d "\\" > $@
- $(CXX) -MM $< $(DEPCXXFLAGS) >> $@
--%.dtmp: %.c factoryconf.h config.h
-+%.dtmp: %.c |factoryconf.h config.h
- echo $*.d "\\" > $@
- $(CXX) -MM $< $(DEPCXXFLAGS) >> $@
- %.dtmp: %.template
-@@ -783,8 +783,10 @@ $(srcdir)/configure: configure.in
- # seems gmake needs at least a trivial command. otherwise all
- # files which depend on config.h will be remade even if congig.h
- # did not change.
--config.h: stamp-h
-- @:
-+#
-+# WTF?
-+#config.h: stamp-h
-+# @:
-
- stamp-h: config.h.in config.status
- CONFIG_FILES= CONFIG_HEADERS=config.h ./config.status
-@@ -800,7 +802,7 @@ config.status: configure
- ./config.status --recheck
-
- # create cf_gmp.h
--cf_gmp.h: GNUmakefile gen_cf_gmp.template
-+cf_gmp.h: gen_cf_gmp.template
- echo "#!/bin/sh" >gen_cf_gmp.sh
- echo "GMP_H_T=\"`g++ $(LIBCXXFLAGS) -M gen_cf_gmp.cc|grep gmp.h` \"" >>gen_cf_gmp.sh
- cat gen_cf_gmp.template >>gen_cf_gmp.sh
-diff --git a/kernel/Makefile.in b/kernel/Makefile.in
-index 7b8b77b..33fb6d9 100644
---- a/kernel/Makefile.in
-+++ b/kernel/Makefile.in
-@@ -253,12 +253,12 @@ p_Procs_Dynamic.o p_Procs_Lib.o p_Procs_Dynamic.og p_Procs_Lib.og\
- p_Procs_Dynamic.inc p_Procs_Lib.inc: p_Procs_Dynamic.h
-
- # here is how p_Procs_[Static|Dynamic].inc is generated
--p_Procs_Static.inc: p_Procs_Generate.cc p_Procs_Impl.h |mod2.h
-+p_Procs_Static.inc: p_Procs_Generate.cc p_Procs_Impl.h
- $(CXX) $(CPPFLAGS) -g -Dp_Procs_Static p_Procs_Generate.cc -o p_Procs_Static
- ./p_Procs_Static > p_Procs_Static.xx && mv p_Procs_Static.xx p_Procs_Static.inc
- -rm -f p_Procs_Static p_Procs_Static.exe
-
--p_Procs_Dynamic.inc: p_Procs_Generate.cc p_Procs_Impl.h |mod2.h
-+p_Procs_Dynamic.inc: p_Procs_Generate.cc p_Procs_Impl.h
- $(CXX) $(CPPFLAGS) -g -Dp_Procs_Dynamic p_Procs_Generate.cc -o p_Procs_Dynamic
- ./p_Procs_Dynamic > p_Procs_Dynamic.xx && mv p_Procs_Dynamic.xx p_Procs_Dynamic.inc
- -rm -f p_Procs_Dynamic p_Procs_Dynamic.exe
-@@ -439,15 +439,15 @@ libkernel_p.a: ${OBJP} ${DL_LIBSP} ${OBJSP2}
- ## dependencies
- ##
-
--%.dd: %.cc mod2.h
-+%.dd: %.cc
- echo $(@:.dd=.og) $(@:.dd=.op) $(@:.dd=.dl_o) $(@:.dd=.dl_og) $(@:.dd=.dl_op)" " \\ > $@
- $(CXXM) -DGENTABLE ${CPPFLAGS} ${DEFSG} $< >> $@
-
--%.d: %.c mod2.h
-+%.d: %.c
- echo $(@:.d=.og) $(@:.d=.op) " " \\ > $@
- $(CCM) ${CPPFLAGS} ${DEFSG} $< >> $@
-
--depend: $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(CSOURCES:.c=.d) mod2.h
-+depend: $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(CSOURCES:.c=.d)
- cat *.d *.dd >depend
-
- ifeq (depend,$(wildcard depend))
-diff --git a/libfac/Makefile.in b/libfac/Makefile.in
-index 62faadb..b16e306 100644
---- a/libfac/Makefile.in
-+++ b/libfac/Makefile.in
-@@ -86,40 +86,40 @@ all: OPTOBJ ${TARGETNAME} libsingfac_g.a
- OPTOBJ:
- ${MKINSTALLDIRS} OPTOBJ
-
--OPTOBJ/%.o: %.cc OPTOBJ
-+OPTOBJ/%.o: %.cc |OPTOBJ
- $(CXX) $(CXXFLAGS) $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/%.o: charset/%.cc OPTOBJ
-+OPTOBJ/%.o: charset/%.cc |OPTOBJ
- $(CXX) $(CXXFLAGS) $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/%.o: factor/%.cc OPTOBJ
-+OPTOBJ/%.o: factor/%.cc |OPTOBJ
- $(CXX) $(CXXFLAGS) $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/tmpl_inst.o: factor/tmpl_inst.cc OPTOBJ
-+OPTOBJ/tmpl_inst.o: factor/tmpl_inst.cc
- $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/%.op: %.cc OPTOBJ
-+OPTOBJ/%.op: %.cc |OPTOBJ
- $(CXX) -O -pg $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/%.op: charset/%.cc OPTOBJ
-+OPTOBJ/%.op: charset/%.cc |OPTOBJ
- $(CXX) -O -pg $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/%.op: factor/%.cc OPTOBJ
-+OPTOBJ/%.op: factor/%.cc |OPTOBJ
- $(CXX) -O -pg $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/tmpl_inst.op: factor/tmpl_inst.cc OPTOBJ
-+OPTOBJ/tmpl_inst.op: factor/tmpl_inst.cc |OPTOBJ
- $(CXX) -O -pg $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/%.og: %.cc OPTOBJ
-+OPTOBJ/%.og: %.cc |OPTOBJ
- $(CXX) -g $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/%.og: charset/%.cc OPTOBJ
-+OPTOBJ/%.og: charset/%.cc |OPTOBJ
- $(CXX) -g $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/%.og: factor/%.cc OPTOBJ
-+OPTOBJ/%.og: factor/%.cc |OPTOBJ
- $(CXX) -g $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-
--OPTOBJ/tmpl_inst.og: factor/tmpl_inst.cc OPTOBJ
-+OPTOBJ/tmpl_inst.og: factor/tmpl_inst.cc |OPTOBJ
- $(CXX) -g $(CPPFLAGS) $(DEFS) -c $< -o $@
-
- libfac: OPTOBJ libfac.a
-diff --git a/omalloc/Makefile.in b/omalloc/Makefile.in
-index 4956179..e3994b8 100644
---- a/omalloc/Makefile.in
-+++ b/omalloc/Makefile.in
-@@ -180,9 +180,9 @@ configure: configure.in
- ##
- install-nolns: install
-
--install-libsingular:
-- $(MKINSTALLDIRS) $(includedir)/singular
-- $(INSTALL) omalloc.h $(includedir)/singular
-+#install-libsingular:
-+# $(MKINSTALLDIRS) $(includedir)/singular
-+# $(INSTALL) omalloc.h $(includedir)/singular
-
- install install-libsingular: all
- $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
diff --git a/debian/patches/0008-assert-needs-to-be-defined-after-include-assert.h.patch b/debian/patches/0008-assert-needs-to-be-defined-after-include-assert.h.patch
deleted file mode 100644
index 1a001c8..0000000
--- a/debian/patches/0008-assert-needs-to-be-defined-after-include-assert.h.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 686a5c09d84490d82c8e83d9ea7ecbdf79308cc2 Mon Sep 17 00:00:00 2001
-From: Felix Salfelder <felix at salfelder.org>
-Date: Thu, 16 Feb 2012 11:23:11 +0100
-Subject: =?UTF-8?q?assert=20needs=20to=20be=20defined=20after=20#include=20"?=
- =?UTF-8?q?assert.h",=0Aalso=20if=20-Ifactory=20is=20used.?=
-
----
- factory/assert.h | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/factory/assert.h b/factory/assert.h
-index 5590bbc..098e8b8 100644
---- a/factory/assert.h
-+++ b/factory/assert.h
-@@ -127,3 +127,9 @@ extern "C" {
- #define PVIRT_CHARCC(msg) = 0
- #endif /* NOASSERT */
- /* }}} */
-+
-+
-+//assert is expected to be available after '#include "assert.h"'
-+#ifndef assert
-+# define assert(a)
-+#endif
diff --git a/debian/patches/0008-miscellaneous-Makefile.in-patches.patch b/debian/patches/0008-miscellaneous-Makefile.in-patches.patch
new file mode 100644
index 0000000..73e0cb6
--- /dev/null
+++ b/debian/patches/0008-miscellaneous-Makefile.in-patches.patch
@@ -0,0 +1,340 @@
+From 447ea0352f53599efe33bf3e104758caf7925b05 Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Thu, 16 Feb 2012 12:37:00 +0100
+Subject: miscellaneous Makefile.in patches
+
+ - fix flags (mostly search paths)
+ - repair default and install targets
+ - remove dependency on mod2.h in kernel. "make depend" works fine
+---
+ Singular/Makefile.in | 46 +++++++++++++++++++++++++++++-----------------
+ emacs/Makefile.in | 5 ++++-
+ factory/GNUmakefile.in | 18 ++++++++++--------
+ kernel/Makefile.in | 10 +++++-----
+ libfac/Makefile.in | 24 ++++++++++++------------
+ omalloc/Makefile.in | 6 +++---
+ 6 files changed, 63 insertions(+), 46 deletions(-)
+
+diff --git a/Singular/Makefile.in b/Singular/Makefile.in
+index 8f004e6..55b13f11 100644
+--- a/Singular/Makefile.in
++++ b/Singular/Makefile.in
+@@ -85,7 +85,7 @@ endif
+ DEFS = -DNDEBUG -DOM_NDEBUG -D at SING_UNAME@ @DEFS@
+ LDFLAGS2 = @LDFLAGS@
+ ifneq ($(SINGUNAME),ix86-Win)
+-LDFLAGS = -L at prefix@/kernel -L../kernel -lkernel @LDFLAGS@
++LDFLAGS = -L at prefix@/kernel -L../kernel -L../omalloc -L../libfac -L../factory -lkernel @LDFLAGS@
+ LDFLAGSG = -L at prefix@/kernel -L../kernel -lkernel_g @LD_DYN_FLAGS1@ @LDFLAGS@
+ LDFLAGSP = -L at prefix@/kernel -L../kernel -lkernel_p @LD_DYN_FLAGS1@ @LDFLAGS@
+ else
+@@ -358,9 +358,9 @@ GFTABLES = $(wildcard LIB/gftables/[1-9]*)
+ fi
+
+ .cc.o:
+- ${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} -c $<
++ ${CXX} -fPIC ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} -c $<
+ .c.o:
+- ${CC} ${CFLAGS} ${CPPFLAGS} ${DEFS} -c $<
++ ${CC} -fPIC ${CFLAGS} ${CPPFLAGS} ${DEFS} -c $<
+
+ %.dl_o : %.cc
+ ${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} ${SFLAGS} -c $< -o $@
+@@ -382,11 +382,13 @@ Singular${S_EXT}: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
+ tesths.cc iparith.o mpsr_Tok.o claptmpl.o\
+ ${OBJS} ${LDFLAGS} ${LIBS} ../kernel/mmalloc.o
+
+-libsingular: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
+- iparith.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS)
++libsingular: libsingular.${SO_SUFFIX}
++
++libsingular.${SO_SUFFIX}: version.h $(WIN_LIBS) scanner.cc ${OBJS} \
++ iparith.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS) tesths.o
+ $(LIBSINGULAR_LD) ${SLDFLAGS} ${LIBSINGULAR_FLAGS} -o libsingular.${SO_SUFFIX} \
+- iparith.o mpsr_Tok.o claptmpl.o \
+- ${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L${libdir} ${LIBSINGULAR_LIBS}
++ tesths.o iparith.o mpsr_Tok.o claptmpl.o \
++ ${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L../omalloc -L${libdir} ${LIBSINGULAR_LIBS}
+
+ libsingular.a: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
+ iparith.o libparse.cc claptmpl.o mpsr_Tok.o
+@@ -422,13 +424,16 @@ iparith.inc: gentable.cc grammar.h tok.h table.h mod2.h
+ ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} gentable.cc \
+ -o gentable1
+ ./gentable1
+- /bin/rm -f gentable1 gentable1.exe
++ # /bin/rm -f gentable1 gentable1.exe
+
+ mpsr_Tok.inc: gentable2.cc grammar.h tok.h table.h mod2.h
+ ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} gentable2.cc \
+ -o gentable2
+ ./gentable2
+- /bin/rm -f gentable2 gentable2.exe
++ # /bin/rm -f gentable2 gentable2.exe
++ #
++ # FIXME: the above doesnt work.
++ touch $@
+
+
+ svnver:
+@@ -472,17 +477,17 @@ TSingular: mod2.h feOpt.cc version.h emacs.cc \
+ feOpt.o: feOpt.inc feOptES.inc feOptTS.inc
+ extra.o: feOpt.inc
+
+-feOpt.inc: feOpt.cc mod2.h
++feOpt.inc: feOpt.cc |mod2.h
+ $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX ${CPPFLAGS} feOpt.cc -o feOpt
+ ./feOpt
+ /bin/rm -f feOpt feOpt.exe
+
+-feOptES.inc: feOpt.cc mod2.h
++feOptES.inc: feOpt.cc |mod2.h
+ $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX -DESINGULAR -I../kernel feOpt.cc -o feOptES
+ ./feOptES
+ rm -f feOptES feOptES.exe
+
+-feOptTS.inc: feOpt.cc mod2.h
++feOptTS.inc: feOpt.cc |mod2.h
+ $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX -DTSINGULAR -I../kernel feOpt.cc -o feOptTS
+ ./feOptTS
+ rm -f feOptTS feOptTS.exe
+@@ -553,11 +558,11 @@ endif
+ ##
+ ## install targets
+ ##
+-install: all installbin installslib
++install: all installbin installslib install-libsingular
+
+ install_all: install
+
+-install-nolns: all installbin-nolns installslib-nolns
++install-ln: all installbin installslib-ln
+
+ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
+ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
+@@ -565,6 +570,12 @@ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
+ -for file in *.so; do \
+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${bindir}; \
+ done
++ ${MKINSTALLDIRS} $(DESTDIR)${install_bindir}
++ ${MKINSTALLDIRS} $(DESTDIR)${libdir}
++ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${SINGULAR}
++ for file in *.so; do \
++ ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
++ done
+ ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} $(DESTDIR)${bindir}
+ ${INSTALL_PROGRAM} ESingular TSingular $(DESTDIR)${bindir}
+ ${INSTALL_PROGRAM} surfex $(DESTDIR)${bindir}
+@@ -575,10 +586,10 @@ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
+ installbin-nolns: installbin
+ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${install_bindir}/Singular${EXEC_EXT};
+
+-installslib: LIB
++installslib-ln: LIB
+ test -r ${slibdir} || ${LN_S} `pwd`/LIB ${slibdir}
+
+-installslib-nolns: LIB
++installslib: LIB
+ ${MKINSTALLDIRS} $(DESTDIR)${slibdir}
+ for file in `pwd`/LIB/*.lib; do \
+ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
+@@ -611,11 +622,12 @@ uninstallbin:
+ mostlyclean:
+ -rm -f Singular Singular-static Singularg Singularp libparse feOpt*.inc
+ -rm -f *.o *.og core *.op *.so* *.dl_o*
+- -rm -f ESingular* TSingular*
++ -rm -f ESingular* TSingular* libsingular
+
+ clean: mostlyclean
+ -rm -f *.bak *.d *.dd depend
+ -rm -f ${slibdir}
++ -rm -f gentable1 gentable2
+
+ distclean: clean
+ -rm -f iparith.inc mpsr_Tok.inc stamp.h
+diff --git a/emacs/Makefile.in b/emacs/Makefile.in
+index 86ba445..47c57e1 100644
+--- a/emacs/Makefile.in
++++ b/emacs/Makefile.in
+@@ -42,9 +42,12 @@ lib-cmpl.el: ${prefix}/Singular/Makefile lib.pl
+ (cd ${prefix}/Singular;${MAKE} --no-print-directory -s -f Makefile echoLIBS) > lib-temp
+ ${PERL} lib.pl -s ${singulardir} `cat lib-temp` > lib-cmpl.el
+
+-clean mostlyclean distclean:
++clean mostlyclean:
+ rm -f cmd-cmpl.el hlp-cmpl.el lib-cmpl.el ex-cmpl.el
+
++distclean: mostlyclean
++ rm -f Makefile
++
+ install-sharedist: all
+ ${MKINSTALLDIRS} ${emacsdir}
+ ${INSTALL_DATA} cmd-cmpl.el ${emacsdir}
+diff --git a/factory/GNUmakefile.in b/factory/GNUmakefile.in
+index 1e8d80d..c80d6e1 100644
+--- a/factory/GNUmakefile.in
++++ b/factory/GNUmakefile.in
+@@ -455,24 +455,24 @@ distfiles := \
+ #
+
+ # how to create library objets
+-%.o: %.cc config.h factoryconf.h
++%.o: %.cc config.h |factoryconf.h
+ $(CXX) -c $< $(LIBCXXFLAGS) -o $@
+ %.o: %.c config.h
+ $(CC) -c $< $(LIBCFLAGS) -o $@
+ # the debug version:
+-%.og: %.cc config.h factoryconf.h
++%.og: %.cc config.h |factoryconf.h
+ $(CXX) -g -c $< $(LIBCGGFLAGS) -o $@
+ # the profiling version:
+-%.op: %.cc config.h factoryconf.h
++%.op: %.cc config.h |factoryconf.h
+ $(CXX) -O -pg -c $< $(LIBCGGFLAGS) -o $@
+
+ # how to create dependency files. To avoid broken dependency files
+ # (which in turn break this GNUmakefile) we first generate them in
+ # a temporary file which we then move to the destination file.
+-%.dtmp: %.cc factoryconf.h config.h
++%.dtmp: %.cc |factoryconf.h config.h
+ echo $*.d "\\" > $@
+ $(CXX) -MM $< $(DEPCXXFLAGS) >> $@
+-%.dtmp: %.c factoryconf.h config.h
++%.dtmp: %.c |factoryconf.h config.h
+ echo $*.d "\\" > $@
+ $(CXX) -MM $< $(DEPCXXFLAGS) >> $@
+ %.dtmp: %.template
+@@ -783,8 +783,10 @@ $(srcdir)/configure: configure.in
+ # seems gmake needs at least a trivial command. otherwise all
+ # files which depend on config.h will be remade even if congig.h
+ # did not change.
+-config.h: stamp-h
+- @:
++#
++# WTF?
++#config.h: stamp-h
++# @:
+
+ stamp-h: config.h.in config.status
+ CONFIG_FILES= CONFIG_HEADERS=config.h ./config.status
+@@ -800,7 +802,7 @@ config.status: configure
+ ./config.status --recheck
+
+ # create cf_gmp.h
+-cf_gmp.h: GNUmakefile gen_cf_gmp.template
++cf_gmp.h: gen_cf_gmp.template
+ echo "#!/bin/sh" >gen_cf_gmp.sh
+ echo "GMP_H_T=\"`g++ $(LIBCXXFLAGS) -M gen_cf_gmp.cc|grep gmp.h` \"" >>gen_cf_gmp.sh
+ cat gen_cf_gmp.template >>gen_cf_gmp.sh
+diff --git a/kernel/Makefile.in b/kernel/Makefile.in
+index 7b8b77b..33fb6d9 100644
+--- a/kernel/Makefile.in
++++ b/kernel/Makefile.in
+@@ -253,12 +253,12 @@ p_Procs_Dynamic.o p_Procs_Lib.o p_Procs_Dynamic.og p_Procs_Lib.og\
+ p_Procs_Dynamic.inc p_Procs_Lib.inc: p_Procs_Dynamic.h
+
+ # here is how p_Procs_[Static|Dynamic].inc is generated
+-p_Procs_Static.inc: p_Procs_Generate.cc p_Procs_Impl.h |mod2.h
++p_Procs_Static.inc: p_Procs_Generate.cc p_Procs_Impl.h
+ $(CXX) $(CPPFLAGS) -g -Dp_Procs_Static p_Procs_Generate.cc -o p_Procs_Static
+ ./p_Procs_Static > p_Procs_Static.xx && mv p_Procs_Static.xx p_Procs_Static.inc
+ -rm -f p_Procs_Static p_Procs_Static.exe
+
+-p_Procs_Dynamic.inc: p_Procs_Generate.cc p_Procs_Impl.h |mod2.h
++p_Procs_Dynamic.inc: p_Procs_Generate.cc p_Procs_Impl.h
+ $(CXX) $(CPPFLAGS) -g -Dp_Procs_Dynamic p_Procs_Generate.cc -o p_Procs_Dynamic
+ ./p_Procs_Dynamic > p_Procs_Dynamic.xx && mv p_Procs_Dynamic.xx p_Procs_Dynamic.inc
+ -rm -f p_Procs_Dynamic p_Procs_Dynamic.exe
+@@ -439,15 +439,15 @@ libkernel_p.a: ${OBJP} ${DL_LIBSP} ${OBJSP2}
+ ## dependencies
+ ##
+
+-%.dd: %.cc mod2.h
++%.dd: %.cc
+ echo $(@:.dd=.og) $(@:.dd=.op) $(@:.dd=.dl_o) $(@:.dd=.dl_og) $(@:.dd=.dl_op)" " \\ > $@
+ $(CXXM) -DGENTABLE ${CPPFLAGS} ${DEFSG} $< >> $@
+
+-%.d: %.c mod2.h
++%.d: %.c
+ echo $(@:.d=.og) $(@:.d=.op) " " \\ > $@
+ $(CCM) ${CPPFLAGS} ${DEFSG} $< >> $@
+
+-depend: $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(CSOURCES:.c=.d) mod2.h
++depend: $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(CSOURCES:.c=.d)
+ cat *.d *.dd >depend
+
+ ifeq (depend,$(wildcard depend))
+diff --git a/libfac/Makefile.in b/libfac/Makefile.in
+index 62faadb..b16e306 100644
+--- a/libfac/Makefile.in
++++ b/libfac/Makefile.in
+@@ -86,40 +86,40 @@ all: OPTOBJ ${TARGETNAME} libsingfac_g.a
+ OPTOBJ:
+ ${MKINSTALLDIRS} OPTOBJ
+
+-OPTOBJ/%.o: %.cc OPTOBJ
++OPTOBJ/%.o: %.cc |OPTOBJ
+ $(CXX) $(CXXFLAGS) $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/%.o: charset/%.cc OPTOBJ
++OPTOBJ/%.o: charset/%.cc |OPTOBJ
+ $(CXX) $(CXXFLAGS) $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/%.o: factor/%.cc OPTOBJ
++OPTOBJ/%.o: factor/%.cc |OPTOBJ
+ $(CXX) $(CXXFLAGS) $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/tmpl_inst.o: factor/tmpl_inst.cc OPTOBJ
++OPTOBJ/tmpl_inst.o: factor/tmpl_inst.cc
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/%.op: %.cc OPTOBJ
++OPTOBJ/%.op: %.cc |OPTOBJ
+ $(CXX) -O -pg $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/%.op: charset/%.cc OPTOBJ
++OPTOBJ/%.op: charset/%.cc |OPTOBJ
+ $(CXX) -O -pg $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/%.op: factor/%.cc OPTOBJ
++OPTOBJ/%.op: factor/%.cc |OPTOBJ
+ $(CXX) -O -pg $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/tmpl_inst.op: factor/tmpl_inst.cc OPTOBJ
++OPTOBJ/tmpl_inst.op: factor/tmpl_inst.cc |OPTOBJ
+ $(CXX) -O -pg $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/%.og: %.cc OPTOBJ
++OPTOBJ/%.og: %.cc |OPTOBJ
+ $(CXX) -g $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/%.og: charset/%.cc OPTOBJ
++OPTOBJ/%.og: charset/%.cc |OPTOBJ
+ $(CXX) -g $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/%.og: factor/%.cc OPTOBJ
++OPTOBJ/%.og: factor/%.cc |OPTOBJ
+ $(CXX) -g $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/tmpl_inst.og: factor/tmpl_inst.cc OPTOBJ
++OPTOBJ/tmpl_inst.og: factor/tmpl_inst.cc |OPTOBJ
+ $(CXX) -g $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+ libfac: OPTOBJ libfac.a
+diff --git a/omalloc/Makefile.in b/omalloc/Makefile.in
+index 4956179..e3994b8 100644
+--- a/omalloc/Makefile.in
++++ b/omalloc/Makefile.in
+@@ -180,9 +180,9 @@ configure: configure.in
+ ##
+ install-nolns: install
+
+-install-libsingular:
+- $(MKINSTALLDIRS) $(includedir)/singular
+- $(INSTALL) omalloc.h $(includedir)/singular
++#install-libsingular:
++# $(MKINSTALLDIRS) $(includedir)/singular
++# $(INSTALL) omalloc.h $(includedir)/singular
+
+ install install-libsingular: all
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
diff --git a/debian/patches/0009-assert-needs-to-be-defined-after-include-assert.h.patch b/debian/patches/0009-assert-needs-to-be-defined-after-include-assert.h.patch
new file mode 100644
index 0000000..b04ffab
--- /dev/null
+++ b/debian/patches/0009-assert-needs-to-be-defined-after-include-assert.h.patch
@@ -0,0 +1,24 @@
+From 3f3d1206dbe4338d751c4cea05db042945a622a3 Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Thu, 16 Feb 2012 11:23:11 +0100
+Subject: =?UTF-8?q?assert=20needs=20to=20be=20defined=20after=20#include=20"?=
+ =?UTF-8?q?assert.h",=0Aalso=20if=20-Ifactory=20is=20used.?=
+
+---
+ factory/assert.h | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/factory/assert.h b/factory/assert.h
+index 5590bbc..098e8b8 100644
+--- a/factory/assert.h
++++ b/factory/assert.h
+@@ -127,3 +127,9 @@ extern "C" {
+ #define PVIRT_CHARCC(msg) = 0
+ #endif /* NOASSERT */
+ /* }}} */
++
++
++//assert is expected to be available after '#include "assert.h"'
++#ifndef assert
++# define assert(a)
++#endif
diff --git a/debian/patches/0009-keep-mod2.h-in-Singular.patch b/debian/patches/0009-keep-mod2.h-in-Singular.patch
deleted file mode 100644
index 3b190a7..0000000
--- a/debian/patches/0009-keep-mod2.h-in-Singular.patch
+++ /dev/null
@@ -1,2493 +0,0 @@
-From 0437b2252c7bc8e7e22256aa377c3e9c724b255a Mon Sep 17 00:00:00 2001
-From: Felix Salfelder <felix at salfelder.org>
-Date: Wed, 22 Feb 2012 11:18:38 +0100
-Subject: keep mod2.h in Singular/
-
-don't copy mod2.h generated in Singular/ to kernel/
-to avoid time stamp issues
----
- Singular/Makefile.in | 2 +-
- Singular/Minor.cc | 2 +-
- Singular/MinorInterface.cc | 2 +-
- Singular/MinorProcessor.cc | 2 +-
- Singular/attrib.cc | 2 +-
- Singular/calcSVD.cc | 2 +-
- Singular/claptmpl.cc | 2 +-
- Singular/cntrlc.cc | 2 +-
- Singular/configure | 1 -
- Singular/configure.in | 1 -
- Singular/eigenval_ip.cc | 2 +-
- Singular/emacs.cc | 2 +-
- Singular/extra.cc | 2 +-
- Singular/feOpt.cc | 2 +-
- Singular/fehelp.cc | 2 +-
- Singular/fglm.cc | 2 +-
- Singular/gms.cc | 2 +-
- Singular/grammar.cc | 2 +-
- Singular/grammar.y | 2 +-
- Singular/interpolation.cc | 2 +-
- Singular/iparith.cc | 2 +-
- Singular/ipassign.cc | 2 +-
- Singular/ipconv.cc | 2 +-
- Singular/ipid.cc | 2 +-
- Singular/iplib.cc | 2 +-
- Singular/ipprint.cc | 2 +-
- Singular/ipshell.cc | 2 +-
- Singular/janet.cc | 2 +-
- Singular/libparse.l | 2 +-
- Singular/lists.cc | 2 +-
- Singular/maps_ip.cc | 2 +-
- Singular/minpoly.cc | 2 +-
- Singular/misc_ip.cc | 2 +-
- Singular/mpsr_Error.cc | 2 +-
- Singular/mpsr_Get.cc | 2 +-
- Singular/mpsr_GetMisc.cc | 2 +-
- Singular/mpsr_GetPoly.cc | 2 +-
- Singular/mpsr_Put.cc | 2 +-
- Singular/mpsr_PutPoly.cc | 2 +-
- Singular/mpsr_Tok.cc | 2 +-
- Singular/mpsr_sl.cc | 2 +-
- Singular/ndbm.cc | 2 +-
- Singular/pcv.cc | 2 +-
- Singular/pipeLink.cc | 2 +-
- Singular/scanner.cc | 2 +-
- Singular/scanner.l | 2 +-
- Singular/sdb.cc | 2 +-
- Singular/silink.cc | 2 +-
- Singular/sing_dbm.cc | 2 +-
- Singular/sing_win.cc | 2 +-
- Singular/slInit_Dynamic.cc | 2 +-
- Singular/slInit_Static.cc | 2 +-
- Singular/ssiLink.cc | 2 +-
- Singular/subexpr.cc | 2 +-
- Singular/tesths.cc | 2 +-
- Singular/walk.cc | 2 +-
- Singular/walk_ip.cc | 2 +-
- Singular/wrapper.cc | 2 +-
- kernel/F4.cc | 2 +-
- kernel/F5cData.cc | 2 +-
- kernel/F5cLists.cc | 2 +-
- kernel/GMPrat.cc | 2 +-
- kernel/Number.h | 2 +-
- kernel/Poly.h | 2 +-
- kernel/PowerSeries.h | 2 +-
- kernel/clapconv.cc | 2 +-
- kernel/clapsing.cc | 2 +-
- kernel/dError.c | 2 +-
- kernel/digitech.cc | 2 +-
- kernel/digitech.h | 2 +-
- kernel/eigenval.cc | 2 +-
- kernel/f5c.cc | 2 +-
- kernel/f5data.cc | 2 +-
- kernel/f5gb.cc | 2 +-
- kernel/f5lists.cc | 2 +-
- kernel/fast_maps.cc | 2 +-
- kernel/fast_mult.cc | 2 +-
- kernel/fast_mult.h | 2 +-
- kernel/feResource.cc | 2 +-
- kernel/febase.cc | 2 +-
- kernel/fegetopt.c | 2 +-
- kernel/feread.cc | 2 +-
- kernel/fereadl.c | 2 +-
- kernel/ffields.cc | 2 +-
- kernel/fglmcomb.cc | 2 +-
- kernel/fglmgauss.cc | 2 +-
- kernel/fglmhom.cc | 2 +-
- kernel/fglmvec.cc | 2 +-
- kernel/fglmzero.cc | 2 +-
- kernel/gfan.cc | 2 +-
- kernel/gnumpc.cc | 2 +-
- kernel/gnumpfl.cc | 2 +-
- kernel/gr_kstd2.cc | 2 +-
- kernel/gring.cc | 2 +-
- kernel/hdegree.cc | 2 +-
- kernel/hilb.cc | 2 +-
- kernel/hutil.cc | 2 +-
- kernel/ideals.cc | 2 +-
- kernel/int64vec.cc | 2 +-
- kernel/intvec.cc | 2 +-
- kernel/kbuckets.cc | 2 +-
- kernel/khstd.cc | 2 +-
- kernel/kspoly.cc | 2 +-
- kernel/kstd1.cc | 2 +-
- kernel/kstd2.cc | 2 +-
- kernel/kstdfac.cc | 2 +-
- kernel/kutil.cc | 2 +-
- kernel/linearAlgebra.cc | 2 +-
- kernel/longalg.cc | 2 +-
- kernel/longrat.cc | 2 +-
- kernel/longrat0.cc | 2 +-
- kernel/longtrans.cc | 2 +-
- kernel/lplist.cc | 2 +-
- kernel/maps.cc | 2 +-
- kernel/matpol.cc | 2 +-
- kernel/misc.cc | 2 +-
- kernel/mmalloc.cc | 2 +-
- kernel/mmstd.c | 2 +-
- kernel/mod_raw.cc | 2 +-
- kernel/modulop.cc | 2 +-
- kernel/mpr_base.cc | 2 +-
- kernel/mpr_complex.cc | 2 +-
- kernel/mpr_inout.cc | 2 +-
- kernel/mpr_numeric.cc | 2 +-
- kernel/multicnt.cc | 2 +-
- kernel/ncSACache.cc | 2 +-
- kernel/ncSAFormula.cc | 2 +-
- kernel/ncSAMult.cc | 2 +-
- kernel/npolygon.cc | 2 +-
- kernel/numbers.cc | 2 +-
- kernel/pDebug.cc | 2 +-
- kernel/pInline0.cc | 2 +-
- kernel/pInline1.cc | 2 +-
- kernel/pInline2.cc | 2 +-
- kernel/pShallowCopyDelete.cc | 2 +-
- kernel/p_Mult_q.cc | 2 +-
- kernel/p_Mult_q.h | 2 +-
- kernel/p_Procs_Dynamic.cc | 2 +-
- kernel/p_Procs_Generate.cc | 2 +-
- kernel/p_Procs_Lib.cc | 2 +-
- kernel/p_Procs_Static.cc | 2 +-
- kernel/p_polys.cc | 2 +-
- kernel/page.c | 2 +-
- kernel/polys-impl.cc | 2 +-
- kernel/polys.cc | 2 +-
- kernel/polys0.cc | 2 +-
- kernel/polys1.cc | 2 +-
- kernel/prCopy.cc | 2 +-
- kernel/ratgring.cc | 2 +-
- kernel/ring.cc | 2 +-
- kernel/ringgb.cc | 2 +-
- kernel/ringgb.h | 2 +-
- kernel/rintegers.cc | 2 +-
- kernel/rmodulo2m.cc | 2 +-
- kernel/rmodulon.cc | 2 +-
- kernel/sbuckets.cc | 2 +-
- kernel/sca.cc | 2 +-
- kernel/semic.cc | 2 +-
- kernel/shiftgb.cc | 2 +-
- kernel/shortfl.cc | 2 +-
- kernel/sparsmat.cc | 2 +-
- kernel/spectrum.cc | 2 +-
- kernel/splist.cc | 2 +-
- kernel/summator.cc | 2 +-
- kernel/syz.cc | 2 +-
- kernel/syz0.cc | 2 +-
- kernel/syz1.cc | 2 +-
- kernel/syz2.cc | 2 +-
- kernel/syz3.cc | 2 +-
- kernel/tgb.cc | 2 +-
- kernel/tgbgauss.cc | 2 +-
- kernel/tgbgauss.h | 2 +-
- kernel/timer.cc | 2 +-
- kernel/tmult.cc | 2 +-
- kernel/units.cc | 2 +-
- kernel/walkMain.cc | 2 +-
- kernel/walkProc.cc | 2 +-
- kernel/walkSupport.cc | 2 +-
- kernel/weight.cc | 2 +-
- kernel/weight0.c | 2 +-
- 180 files changed, 178 insertions(+), 180 deletions(-)
-
-diff --git a/Singular/Makefile.in b/Singular/Makefile.in
-index e4b7530..588d981 100644
---- a/Singular/Makefile.in
-+++ b/Singular/Makefile.in
-@@ -612,7 +612,7 @@ install-libsingular: ${LIBSINGULAR_NAME}
- ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
- done
- ${INSTALL_PROGRAM} libsingular.h $(DESTDIR)${includedir}
-- for file in subexpr.h tok.h grammar.h ipid.h lists.h ipshell.h attrib.h; do \
-+ for file in mod2.h subexpr.h tok.h grammar.h ipid.h lists.h ipshell.h attrib.h; do \
- sed -e "s:<kernel/:<singular/:" < $$file |sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" >$(DESTDIR)${includedir}/singular/$$file ;\
- done
-
-diff --git a/Singular/Minor.cc b/Singular/Minor.cc
-index 402d7e6..4e358c5 100644
---- a/Singular/Minor.cc
-+++ b/Singular/Minor.cc
-@@ -1,4 +1,4 @@
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <kernel/polys.h>
- #include <Minor.h>
-diff --git a/Singular/MinorInterface.cc b/Singular/MinorInterface.cc
-index 50ceae8..8d2a1c4 100644
---- a/Singular/MinorInterface.cc
-+++ b/Singular/MinorInterface.cc
-@@ -1,4 +1,4 @@
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <kernel/polys.h>
- #include <kernel/ideals.h>
-diff --git a/Singular/MinorProcessor.cc b/Singular/MinorProcessor.cc
-index 1c08156..6ff81aa 100644
---- a/Singular/MinorProcessor.cc
-+++ b/Singular/MinorProcessor.cc
-@@ -1,4 +1,4 @@
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <kernel/polys.h>
- #include <MinorProcessor.h>
-diff --git a/Singular/attrib.cc b/Singular/attrib.cc
-index 570f4e2..8d9e38b 100644
---- a/Singular/attrib.cc
-+++ b/Singular/attrib.cc
-@@ -13,7 +13,7 @@
- #include <ctype.h>
- #include <unistd.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/omalloc.h>
- #include <kernel/options.h>
- #include <Singular/tok.h>
-diff --git a/Singular/calcSVD.cc b/Singular/calcSVD.cc
-index bf80b3c..1e889dd 100644
---- a/Singular/calcSVD.cc
-+++ b/Singular/calcSVD.cc
-@@ -1,5 +1,5 @@
- #include <stdio.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_SVD
-
-diff --git a/Singular/claptmpl.cc b/Singular/claptmpl.cc
-index 1038422..6b33638 100644
---- a/Singular/claptmpl.cc
-+++ b/Singular/claptmpl.cc
-@@ -7,7 +7,7 @@
- * ABSTRACT - instantiation of all templates
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- //#include <vector>
- //using namespace std;
- #ifdef HAVE_FACTORY
-diff --git a/Singular/cntrlc.cc b/Singular/cntrlc.cc
-index c327a19..5d0a81f 100644
---- a/Singular/cntrlc.cc
-+++ b/Singular/cntrlc.cc
-@@ -17,7 +17,7 @@
- #include <signal.h>
- #include <sys/types.h>
- #include <sys/wait.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/omalloc.h>
- #include <Singular/tok.h>
- #include <Singular/ipshell.h>
-diff --git a/Singular/configure b/Singular/configure
-index 6615b4a..a173565 100755
---- a/Singular/configure
-+++ b/Singular/configure
-@@ -6343,7 +6343,6 @@ cat >> $CONFIG_STATUS <<EOF
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- \
-- cp mod2.h ../kernel/mod2.h; \
- if test "$CONFIG_HEADERS"; then echo timestamp > stamp-h; fi
- exit 0
- EOF
-diff --git a/Singular/configure.in b/Singular/configure.in
-index 9442595..ac9aab5 100644
---- a/Singular/configure.in
-+++ b/Singular/configure.in
-@@ -1374,5 +1374,4 @@ if test "$ac_cv_singuname" = "ix86-Win"; then
- fi
-
- AC_OUTPUT(${OUTPUT_MAKEFILES}, \
-- cp mod2.h ../kernel/mod2.h; \
- if test "$CONFIG_HEADERS"; then echo timestamp > stamp-h; fi)
-diff --git a/Singular/eigenval_ip.cc b/Singular/eigenval_ip.cc
-index 8a69599..7ae982d 100644
---- a/Singular/eigenval_ip.cc
-+++ b/Singular/eigenval_ip.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT: eigenvalues of constant square matrices
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_EIGENVAL
-
-diff --git a/Singular/emacs.cc b/Singular/emacs.cc
-index ced2f19..19e2f43 100644
---- a/Singular/emacs.cc
-+++ b/Singular/emacs.cc
-@@ -18,7 +18,7 @@
- #ifdef ix86_Win
- #include <windows.h>
- #endif
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/version.h>
- #include <omalloc/omalloc.h>
-
-diff --git a/Singular/extra.cc b/Singular/extra.cc
-index 9a8f021..47ec69b 100644
---- a/Singular/extra.cc
-+++ b/Singular/extra.cc
-@@ -12,7 +12,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <signal.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <misc_ip.h>
-
- #ifdef TIME_WITH_SYS_TIME
-diff --git a/Singular/feOpt.cc b/Singular/feOpt.cc
-index 2421ba0..17308fa 100644
---- a/Singular/feOpt.cc
-+++ b/Singular/feOpt.cc
-@@ -8,7 +8,7 @@
-
- #include <string.h>
- #include <stdlib.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/feOpt.h>
- #if !defined(GENERATE_OPTION_INDEX) && !defined(ESINGULAR) && !defined(TSINGULAR)
- #include <kernel/options.h>
-diff --git a/Singular/fehelp.cc b/Singular/fehelp.cc
-index 34a0ffb..22a6781 100644
---- a/Singular/fehelp.cc
-+++ b/Singular/fehelp.cc
-@@ -13,7 +13,7 @@
- #include <stdlib.h>
- #include <time.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/mylimits.h>
- #include <Singular/tok.h>
- #include <omalloc/omalloc.h>
-diff --git a/Singular/fglm.cc b/Singular/fglm.cc
-index 41b489b..71f4cb3 100644
---- a/Singular/fglm.cc
-+++ b/Singular/fglm.cc
-@@ -16,7 +16,7 @@
- * lying in a 0-dimensional ideal.
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_FACTORY
- #include <Singular/tok.h>
-diff --git a/Singular/gms.cc b/Singular/gms.cc
-index 7e7880e..1b19df4 100644
---- a/Singular/gms.cc
-+++ b/Singular/gms.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT: Gauss-Manin system normal form
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_GMS
-
-diff --git a/Singular/grammar.cc b/Singular/grammar.cc
-index 72ca79a..7caf741 100644
---- a/Singular/grammar.cc
-+++ b/Singular/grammar.cc
-@@ -319,7 +319,7 @@
- #include <stdarg.h>
- #include <string.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/mylimits.h>
- #include <omalloc/omalloc.h>
- #include <Singular/tok.h>
-diff --git a/Singular/grammar.y b/Singular/grammar.y
-index e3cfc5b..afc979a 100644
---- a/Singular/grammar.y
-+++ b/Singular/grammar.y
-@@ -12,7 +12,7 @@
- #include <stdarg.h>
- #include <string.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/mylimits.h>
- #include <omalloc/omalloc.h>
- #include <Singular/tok.h>
-diff --git a/Singular/interpolation.cc b/Singular/interpolation.cc
-index c93edd7..5716d4a 100644
---- a/Singular/interpolation.cc
-+++ b/Singular/interpolation.cc
-@@ -3,7 +3,7 @@
- ****************************************/
- /* $Id: interpolation.cc 14320 2011-07-04 14:48:27Z hannes $ */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/options.h>
- #include <kernel/febase.h>
- #include <kernel/ideals.h>
-diff --git a/Singular/iparith.cc b/Singular/iparith.cc
-index 884d724..fd51f29 100644
---- a/Singular/iparith.cc
-+++ b/Singular/iparith.cc
-@@ -12,7 +12,7 @@
- #include <time.h>
- #include <unistd.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/tok.h>
- #include <kernel/options.h>
- #include <Singular/ipid.h>
-diff --git a/Singular/ipassign.cc b/Singular/ipassign.cc
-index 76d25d3..9a0b0ac 100644
---- a/Singular/ipassign.cc
-+++ b/Singular/ipassign.cc
-@@ -12,7 +12,7 @@
- #include <string.h>
- #include <ctype.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/tok.h>
- #include <kernel/options.h>
- #include <Singular/ipid.h>
-diff --git a/Singular/ipconv.cc b/Singular/ipconv.cc
-index 202ddf1..0c8e1b5 100644
---- a/Singular/ipconv.cc
-+++ b/Singular/ipconv.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT: automatic type conversions
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/tok.h>
- #include <Singular/ipid.h>
- #include <kernel/intvec.h>
-diff --git a/Singular/ipid.cc b/Singular/ipid.cc
-index a989211..c36198c 100644
---- a/Singular/ipid.cc
-+++ b/Singular/ipid.cc
-@@ -7,7 +7,7 @@
-
- #include <string.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/static.h>
- #include <omalloc/omalloc.h>
- #include <Singular/tok.h>
-diff --git a/Singular/iplib.cc b/Singular/iplib.cc
-index bccbc4c..821e92a 100644
---- a/Singular/iplib.cc
-+++ b/Singular/iplib.cc
-@@ -11,7 +11,7 @@
- #include <ctype.h>
- #include <sys/stat.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/static.h>
- #include <Singular/tok.h>
- #include <kernel/options.h>
-diff --git a/Singular/ipprint.cc b/Singular/ipprint.cc
-index 6adf3a1..16a05d8 100644
---- a/Singular/ipprint.cc
-+++ b/Singular/ipprint.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT: interpreter: printing
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/tok.h>
- #include <Singular/ipid.h>
- #include <omalloc/omalloc.h>
-diff --git a/Singular/ipshell.cc b/Singular/ipshell.cc
-index c4553fc..2aec463 100644
---- a/Singular/ipshell.cc
-+++ b/Singular/ipshell.cc
-@@ -11,7 +11,7 @@
- #include <ctype.h>
- #include <math.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/tok.h>
- #include <kernel/options.h>
- #include <Singular/ipid.h>
-diff --git a/Singular/janet.cc b/Singular/janet.cc
-index d381a46..a0d24ba 100755
---- a/Singular/janet.cc
-+++ b/Singular/janet.cc
-@@ -3,7 +3,7 @@
- #include <string.h>
- #include <time.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/omalloc.h>
- #include <kernel/polys.h>
- #include <kernel/numbers.h>
-diff --git a/Singular/libparse.l b/Singular/libparse.l
-index c69af26..c85079b 100644
---- a/Singular/libparse.l
-+++ b/Singular/libparse.l
-@@ -7,7 +7,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <ctype.h>
--#include <kernel/mod2.h>
-+#include "mod2.h"
- #ifdef STANDALONE_PARSER
- #include <Singular/utils.h>
- #define HAVE_LIBPARSER
-diff --git a/Singular/lists.cc b/Singular/lists.cc
-index d66f29d..d043fca 100644
---- a/Singular/lists.cc
-+++ b/Singular/lists.cc
-@@ -8,7 +8,7 @@
- // to produce a non-inline version from lists.h
- #define LISTS_CC
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/tok.h>
- #include <kernel/febase.h>
- //#include "ipid.h"
-diff --git a/Singular/maps_ip.cc b/Singular/maps_ip.cc
-index c74e8fd..cf34eaa 100644
---- a/Singular/maps_ip.cc
-+++ b/Singular/maps_ip.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT - the mapping of polynomials to other rings
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/tok.h>
- #include <kernel/febase.h>
- #include <kernel/polys.h>
-diff --git a/Singular/minpoly.cc b/Singular/minpoly.cc
-index c081a54..8538700 100644
---- a/Singular/minpoly.cc
-+++ b/Singular/minpoly.cc
-@@ -5,7 +5,7 @@
-
-
- #include<cmath>
--#include<Singular/mod2.h>
-+#include <Singular/mod2.h>
- //#include<iomanip>
-
- #include "minpoly.h"
-diff --git a/Singular/misc_ip.cc b/Singular/misc_ip.cc
-index 43c1629..99de664 100644
---- a/Singular/misc_ip.cc
-+++ b/Singular/misc_ip.cc
-@@ -14,7 +14,7 @@
- /*****************************************************************************/
-
- // include header files
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/lists.h>
- #include <kernel/longrat.h>
- #include <Singular/misc_ip.h>
-diff --git a/Singular/mpsr_Error.cc b/Singular/mpsr_Error.cc
-index be4b923..0d1142f 100644
---- a/Singular/mpsr_Error.cc
-+++ b/Singular/mpsr_Error.cc
-@@ -12,7 +12,7 @@
- * Change History (most recent first):
- *
- ***************************************************************/
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_MPSR
-
-diff --git a/Singular/mpsr_Get.cc b/Singular/mpsr_Get.cc
-index 6708165..e305e34 100644
---- a/Singular/mpsr_Get.cc
-+++ b/Singular/mpsr_Get.cc
-@@ -13,7 +13,7 @@
- *
- ***************************************************************/
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_MPSR
-
-diff --git a/Singular/mpsr_GetMisc.cc b/Singular/mpsr_GetMisc.cc
-index fda7ac3..457b01e 100644
---- a/Singular/mpsr_GetMisc.cc
-+++ b/Singular/mpsr_GetMisc.cc
-@@ -13,7 +13,7 @@
- *
- ***************************************************************/
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_MPSR
-
-diff --git a/Singular/mpsr_GetPoly.cc b/Singular/mpsr_GetPoly.cc
-index de57603..4d885ee 100644
---- a/Singular/mpsr_GetPoly.cc
-+++ b/Singular/mpsr_GetPoly.cc
-@@ -12,7 +12,7 @@
- *
- *
- ***************************************************************/
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_MPSR
- #include "mylimits.h"
-diff --git a/Singular/mpsr_Put.cc b/Singular/mpsr_Put.cc
-index ca868a5..46c336f 100644
---- a/Singular/mpsr_Put.cc
-+++ b/Singular/mpsr_Put.cc
-@@ -14,7 +14,7 @@
- * Updated putting routines to MP and MPP v1.1
- *
- ***************************************************************/
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_MPSR
-
-diff --git a/Singular/mpsr_PutPoly.cc b/Singular/mpsr_PutPoly.cc
-index 51c67de..7c19889 100644
---- a/Singular/mpsr_PutPoly.cc
-+++ b/Singular/mpsr_PutPoly.cc
-@@ -15,7 +15,7 @@
- * Updated routines to MP and MPP v1.1
- *
- ***************************************************************/
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_MPSR
-
-diff --git a/Singular/mpsr_Tok.cc b/Singular/mpsr_Tok.cc
-index 8d8873c..a006d79 100644
---- a/Singular/mpsr_Tok.cc
-+++ b/Singular/mpsr_Tok.cc
-@@ -18,7 +18,7 @@
- #include <sys/types.h>
- #include <unistd.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_MPSR
-
-diff --git a/Singular/mpsr_sl.cc b/Singular/mpsr_sl.cc
-index 39224f3..84f0db2 100644
---- a/Singular/mpsr_sl.cc
-+++ b/Singular/mpsr_sl.cc
-@@ -9,7 +9,7 @@
- * Version: $Id: mpsr_sl.cc 13937 2011-03-07 16:10:06Z hannes $
- *******************************************************************/
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_MPSR
-
-diff --git a/Singular/ndbm.cc b/Singular/ndbm.cc
-index c6f4e11..f67fe34 100644
---- a/Singular/ndbm.cc
-+++ b/Singular/ndbm.cc
-@@ -14,7 +14,7 @@
- //
- //**************************************************************************/
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #ifdef HAVE_DBM
- #ifndef HPUX_9
- #include <strings.h>
-diff --git a/Singular/pcv.cc b/Singular/pcv.cc
-index de543be..d463a09 100644
---- a/Singular/pcv.cc
-+++ b/Singular/pcv.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT: conversion between polys and coef vectors
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_PCV
- //#if !defined(HAVE_DYNAMIC_LOADING) || defined(BUILD_MODULE)
-diff --git a/Singular/pipeLink.cc b/Singular/pipeLink.cc
-index 755efd6..25bb557 100644
---- a/Singular/pipeLink.cc
-+++ b/Singular/pipeLink.cc
-@@ -17,7 +17,7 @@
- #include <sys/socket.h>
-
-
--#include "mod2.h"
-+#include <Singular/mod2.h>
-
- #include "tok.h"
- #include "ipid.h"
-diff --git a/Singular/scanner.cc b/Singular/scanner.cc
-index bbe8eea..16cbbfc 100644
---- a/Singular/scanner.cc
-+++ b/Singular/scanner.cc
-@@ -561,7 +561,7 @@ char *yytext;
- #include <stdlib.h>
- #include <ctype.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/omalloc.h>
- #include <Singular/tok.h>
- #include <Singular/stype.h>
-diff --git a/Singular/scanner.l b/Singular/scanner.l
-index 384072b..aad2f7f 100644
---- a/Singular/scanner.l
-+++ b/Singular/scanner.l
-@@ -8,7 +8,7 @@
- #include <stdlib.h>
- #include <ctype.h>
-
--#include <kernel/mod2.h>
-+#include "mod2.h"
- #include <omalloc/omalloc.h>
- #include <Singular/tok.h>
- #include <Singular/stype.h>
-diff --git a/Singular/sdb.cc b/Singular/sdb.cc
-index 7460449..300bea0 100644
---- a/Singular/sdb.cc
-+++ b/Singular/sdb.cc
-@@ -8,7 +8,7 @@
-
- #include <unistd.h> // for unlink,fork,execlp,getpid
- #include <sys/wait.h> // for wait
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/tok.h>
- #include <kernel/options.h>
- #include <omalloc/omalloc.h>
-diff --git a/Singular/silink.cc b/Singular/silink.cc
-index 90c11da..a96b7e3 100644
---- a/Singular/silink.cc
-+++ b/Singular/silink.cc
-@@ -13,7 +13,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/tok.h>
- #include <kernel/options.h>
- #include <omalloc/omalloc.h>
-diff --git a/Singular/sing_dbm.cc b/Singular/sing_dbm.cc
-index cb84bb2..2fb06c7 100644
---- a/Singular/sing_dbm.cc
-+++ b/Singular/sing_dbm.cc
-@@ -16,7 +16,7 @@
- # include <fcntl.h>
- # include <errno.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_DBM
-
-diff --git a/Singular/sing_win.cc b/Singular/sing_win.cc
-index b2fc5ea..a961016 100644
---- a/Singular/sing_win.cc
-+++ b/Singular/sing_win.cc
-@@ -7,7 +7,7 @@
- * ABSTRACT: Windows specific routines
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #ifdef ix86_Win
- #include <windows.h>
- #include <winuser.h>
-diff --git a/Singular/slInit_Dynamic.cc b/Singular/slInit_Dynamic.cc
-index f93653e..8c179ee 100644
---- a/Singular/slInit_Dynamic.cc
-+++ b/Singular/slInit_Dynamic.cc
-@@ -14,7 +14,7 @@
- * MP link Extension inits
- *
- ***************************************************************/
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/silink.h>
- #include <Singular/slInit.h>
- #include <kernel/mod_raw.h>
-diff --git a/Singular/slInit_Static.cc b/Singular/slInit_Static.cc
-index ffe3eed..fef9eac 100644
---- a/Singular/slInit_Static.cc
-+++ b/Singular/slInit_Static.cc
-@@ -14,7 +14,7 @@
- * MP link Extension inits
- *
- ***************************************************************/
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/silink.h>
- #include <Singular/slInit.h>
-
-diff --git a/Singular/ssiLink.cc b/Singular/ssiLink.cc
-index 0705a7d..f216dc8 100644
---- a/Singular/ssiLink.cc
-+++ b/Singular/ssiLink.cc
-@@ -22,7 +22,7 @@
-
-
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- // #include "mod2.h"
-
- #include <Singular/tok.h>
-diff --git a/Singular/subexpr.cc b/Singular/subexpr.cc
-index bba1b6d..1f63592 100644
---- a/Singular/subexpr.cc
-+++ b/Singular/subexpr.cc
-@@ -11,7 +11,7 @@
- #include <ctype.h>
- #include <unistd.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/intvec.h>
- #include <Singular/tok.h>
- #include <kernel/options.h>
-diff --git a/Singular/tesths.cc b/Singular/tesths.cc
-index 475d942..10e9cc0 100644
---- a/Singular/tesths.cc
-+++ b/Singular/tesths.cc
-@@ -14,7 +14,7 @@
- #include <stdlib.h>
- #include <time.h>
- #include <errno.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/tok.h>
- #include <kernel/options.h>
- #include <Singular/ipshell.h>
-diff --git a/Singular/walk.cc b/Singular/walk.cc
-index 34ba272..f4bc159 100644
---- a/Singular/walk.cc
-+++ b/Singular/walk.cc
-@@ -46,7 +46,7 @@
- #include <sys/types.h>
-
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/intvec.h>
- #include <Singular/cntrlc.h>
- #include <kernel/options.h>
-diff --git a/Singular/walk_ip.cc b/Singular/walk_ip.cc
-index a315433..01a58a4 100644
---- a/Singular/walk_ip.cc
-+++ b/Singular/walk_ip.cc
-@@ -12,7 +12,7 @@
- #include <ctype.h>
- #include <math.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/tok.h>
- #include <kernel/options.h>
- #include <Singular/ipid.h>
-diff --git a/Singular/wrapper.cc b/Singular/wrapper.cc
-index 07a2e2f..7884e9f 100755
---- a/Singular/wrapper.cc
-+++ b/Singular/wrapper.cc
-@@ -1,5 +1,5 @@
- #include <string.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/febase.h>
- #include <kernel/polys.h>
- #include <kernel/kstd1.h>
-diff --git a/kernel/F4.cc b/kernel/F4.cc
-index 3e56e0b..22c7699 100644
---- a/kernel/F4.cc
-+++ b/kernel/F4.cc
-@@ -1,4 +1,4 @@
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/F4.h>
- #include <kernel/tgb_internal.h>
- #include <kernel/tgbgauss.h>
-diff --git a/kernel/F5cData.cc b/kernel/F5cData.cc
-index be2021a..384ebc9 100644
---- a/kernel/F5cData.cc
-+++ b/kernel/F5cData.cc
-@@ -9,7 +9,7 @@
- * these data types is defined.
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_F5C
- #include <kernel/kutil.h>
-diff --git a/kernel/F5cLists.cc b/kernel/F5cLists.cc
-index daab9db..8922036 100644
---- a/kernel/F5cLists.cc
-+++ b/kernel/F5cLists.cc
-@@ -1,4 +1,4 @@
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_F5C
- #include <kernel/kutil.h>
-diff --git a/kernel/GMPrat.cc b/kernel/GMPrat.cc
-index 8d73221..628d90d 100644
---- a/kernel/GMPrat.cc
-+++ b/kernel/GMPrat.cc
-@@ -8,7 +8,7 @@
-
- #define GMPRAT_CC
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_SPECTRUM
-
-diff --git a/kernel/Number.h b/kernel/Number.h
-index 4428d15..05f52b7 100644
---- a/kernel/Number.h
-+++ b/kernel/Number.h
-@@ -1,7 +1,7 @@
- #ifndef NUMBERCPP_HEADER
- #define NUMBERCPP_HEADER
- #include <boost/intrusive_ptr.hpp>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/numbers.h>
- #include <kernel/febase.h>
- #include <kernel/ring.h>
-diff --git a/kernel/Poly.h b/kernel/Poly.h
-index 481e96a..d95614b 100644
---- a/kernel/Poly.h
-+++ b/kernel/Poly.h
-@@ -4,7 +4,7 @@
-
- #ifndef POLYCPP_HEADER
- #define POLYCPP_HEADER
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/IIntvec.h>
- #include <kernel/numbers.h>
- #include <kernel/Number.h>
-diff --git a/kernel/PowerSeries.h b/kernel/PowerSeries.h
-index 809d0b5..7c3f764 100644
---- a/kernel/PowerSeries.h
-+++ b/kernel/PowerSeries.h
-@@ -1,6 +1,6 @@
- #ifndef POWER_SERIES_HEADER
- #define POWER_SERIES_HEADER
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/Poly.h>
- template <class traits> class PowerSeriesInputIterator:
- public std::
-diff --git a/kernel/clapconv.cc b/kernel/clapconv.cc
-index a043330..3cf1386 100644
---- a/kernel/clapconv.cc
-+++ b/kernel/clapconv.cc
-@@ -8,7 +8,7 @@
- */
-
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #ifdef HAVE_FACTORY
- #include <omalloc/omalloc.h>
- #include <kernel/structs.h>
-diff --git a/kernel/clapsing.cc b/kernel/clapsing.cc
-index 2159b6a..e822a0a 100644
---- a/kernel/clapsing.cc
-+++ b/kernel/clapsing.cc
-@@ -8,7 +8,7 @@
- */
-
- //#define FACTORIZE2_DEBUG
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/omalloc.h>
- #ifdef HAVE_FACTORY
- #define SI_DONT_HAVE_GLOBAL_VARS
-diff --git a/kernel/dError.c b/kernel/dError.c
-index 61a5076..18c9ec4 100644
---- a/kernel/dError.c
-+++ b/kernel/dError.c
-@@ -12,7 +12,7 @@
- #define DERROR_C
- #include <stdarg.h>
- #include <stdio.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/distrib.h>
- #ifdef HAVE_CONFIG_H
- #include <omalloc/omalloc.h>
-diff --git a/kernel/digitech.cc b/kernel/digitech.cc
-index 89f6a44..a03ccdf 100644
---- a/kernel/digitech.cc
-+++ b/kernel/digitech.cc
-@@ -2,7 +2,7 @@
- * Computer Algebra System SINGULAR *
- ****************************************/
- /* $Id: digitech.cc 13628 2010-11-10 16:07:34Z hannes $ */
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/ring.h>
-
- #include <kernel/digitech.h>
-diff --git a/kernel/digitech.h b/kernel/digitech.h
-index b8d0fd3..a1ceb37 100644
---- a/kernel/digitech.h
-+++ b/kernel/digitech.h
-@@ -1,6 +1,6 @@
- #ifndef DIGITECH_HEADER
- #define DIGITECH_HEADER
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/polys.h>
- void bit_reduce(poly & f,ring r);
- poly uni_subst_bits(poly outer_uni, poly inner_multi, ring r);
-diff --git a/kernel/eigenval.cc b/kernel/eigenval.cc
-index c2dad58..2c4d628 100644
---- a/kernel/eigenval.cc
-+++ b/kernel/eigenval.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT: eigenvalues of constant square matrices
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_EIGENVAL
-
-diff --git a/kernel/f5c.cc b/kernel/f5c.cc
-index c1e3b33..caebac9 100644
---- a/kernel/f5c.cc
-+++ b/kernel/f5c.cc
-@@ -1,4 +1,4 @@
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #ifdef HAVE_F5C
- #include <unistd.h>
- #include <kernel/structs.h>
-diff --git a/kernel/f5data.cc b/kernel/f5data.cc
-index d5c716a..7033b45 100644
---- a/kernel/f5data.cc
-+++ b/kernel/f5data.cc
-@@ -6,7 +6,7 @@
- /*
- * ABSTRACT: lpolynomial definition
- */
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_F5
- #include <kernel/kutil.h>
-diff --git a/kernel/f5gb.cc b/kernel/f5gb.cc
-index d308517..72b20d0 100644
---- a/kernel/f5gb.cc
-+++ b/kernel/f5gb.cc
-@@ -5,7 +5,7 @@
- * ABSTRACT: f5gb interface
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #ifdef HAVE_F5
- #include <unistd.h>
- #include <omp.h>
-diff --git a/kernel/f5lists.cc b/kernel/f5lists.cc
-index ae0bcab..4546a17 100644
---- a/kernel/f5lists.cc
-+++ b/kernel/f5lists.cc
-@@ -1,4 +1,4 @@
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_F5
- #include <kernel/kutil.h>
-diff --git a/kernel/fast_maps.cc b/kernel/fast_maps.cc
-index 4866aed..205abb3 100644
---- a/kernel/fast_maps.cc
-+++ b/kernel/fast_maps.cc
-@@ -8,7 +8,7 @@
- * Created: 02/01
- * Version: $Id: fast_maps.cc 13210 2010-09-17 13:36:19Z seelisch $
- *******************************************************************/
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/omalloc.h>
- #include <kernel/options.h>
- #include <kernel/p_polys.h>
-diff --git a/kernel/fast_mult.cc b/kernel/fast_mult.cc
-index 95b40c4..39f12c4 100644
---- a/kernel/fast_mult.cc
-+++ b/kernel/fast_mult.cc
-@@ -2,7 +2,7 @@
- * Computer Algebra System SINGULAR *
- ****************************************/
- /* $Id: fast_mult.cc 14278 2011-06-14 13:49:47Z hannes $ */
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/ring.h>
- #include <kernel/fast_mult.h>
- #include <kernel/kbuckets.h>
-diff --git a/kernel/fast_mult.h b/kernel/fast_mult.h
-index 43a4344..41e97e4 100644
---- a/kernel/fast_mult.h
-+++ b/kernel/fast_mult.h
-@@ -1,6 +1,6 @@
- #ifndef fast_mult_header
- #define fast_mult_header
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/polys.h>
- poly unifastmult(poly f,poly g, ring r);
- poly multifastmult(poly f, poly g, ring r);
-diff --git a/kernel/feResource.cc b/kernel/feResource.cc
-index 7b1be9b..445cc6d 100644
---- a/kernel/feResource.cc
-+++ b/kernel/feResource.cc
-@@ -10,7 +10,7 @@
- #include <unistd.h>
- #include <string.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #ifdef AIX_4
- #define HAVE_PUTENV 1
- #endif
-diff --git a/kernel/febase.cc b/kernel/febase.cc
-index b8a7789..6d1bbd4 100644
---- a/kernel/febase.cc
-+++ b/kernel/febase.cc
-@@ -8,7 +8,7 @@
-
- /* I need myfread in standalone_parser */
- #ifndef STANDALONE_PARSER
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #include <stdlib.h>
- #include <stdio.h>
-diff --git a/kernel/fegetopt.c b/kernel/fegetopt.c
-index 6bac789..bf312ee 100644
---- a/kernel/fegetopt.c
-+++ b/kernel/fegetopt.c
-@@ -32,7 +32,7 @@
- */
-
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifndef __STDC__
- # ifndef const
-diff --git a/kernel/feread.cc b/kernel/feread.cc
-index a77285b..f3e7f12 100644
---- a/kernel/feread.cc
-+++ b/kernel/feread.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT: input from ttys, simulating fgets
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- // ----------------------------------------
- // system settings:
-diff --git a/kernel/fereadl.c b/kernel/fereadl.c
-index 9f3407b..21873b8 100644
---- a/kernel/fereadl.c
-+++ b/kernel/fereadl.c
-@@ -7,7 +7,7 @@
- */
-
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/febase.h>
- #include <omalloc/omalloc.h>
- #include <kernel/structs.h>
-diff --git a/kernel/ffields.cc b/kernel/ffields.cc
-index 91ed4e3..c1143c8 100644
---- a/kernel/ffields.cc
-+++ b/kernel/ffields.cc
-@@ -7,7 +7,7 @@
- */
-
- #include <string.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/mylimits.h>
- #include <kernel/febase.h>
- #include <omalloc/omalloc.h>
-diff --git a/kernel/fglmcomb.cc b/kernel/fglmcomb.cc
-index 3d3eaa1..d19eead 100644
---- a/kernel/fglmcomb.cc
-+++ b/kernel/fglmcomb.cc
-@@ -8,7 +8,7 @@
- * ABSTRACT -
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_FACTORY
- #include <kernel/options.h>
-diff --git a/kernel/fglmgauss.cc b/kernel/fglmgauss.cc
-index 5764597..d3b3ee4 100644
---- a/kernel/fglmgauss.cc
-+++ b/kernel/fglmgauss.cc
-@@ -9,7 +9,7 @@
- * to find linear dependecies of fglmVectors.
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_FACTORY
- #include <kernel/structs.h>
-diff --git a/kernel/fglmhom.cc b/kernel/fglmhom.cc
-index 468dc2c..61219da 100644
---- a/kernel/fglmhom.cc
-+++ b/kernel/fglmhom.cc
-@@ -10,7 +10,7 @@
- */
-
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #if 0
- #include <factoryconf.h>
- #ifndef NOSTREAMIO
-diff --git a/kernel/fglmvec.cc b/kernel/fglmvec.cc
-index b9f90da..c2d8579 100644
---- a/kernel/fglmvec.cc
-+++ b/kernel/fglmvec.cc
-@@ -12,7 +12,7 @@
- * specialized for this purpose.
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_FACTORY
- #include <omalloc/omalloc.h>
-diff --git a/kernel/fglmzero.cc b/kernel/fglmzero.cc
-index e9d3dae..b3bd181 100644
---- a/kernel/fglmzero.cc
-+++ b/kernel/fglmzero.cc
-@@ -18,7 +18,7 @@
- * o FindUnivariatePolys added
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_FACTORY
- #include <kernel/options.h>
-diff --git a/kernel/gfan.cc b/kernel/gfan.cc
-index ca08a3c..55c9431 100644
---- a/kernel/gfan.cc
-+++ b/kernel/gfan.cc
-@@ -6,7 +6,7 @@ $Header: /usr/local/Singular/cvsroot/kernel/gfan.cc,v 1.103 2009/11/03 06:57:32
- $Id: gfan.cc 14493 2012-01-16 11:00:07Z motsak $
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_FANS
- #include <kernel/options.h>
-diff --git a/kernel/gnumpc.cc b/kernel/gnumpc.cc
-index da6d51c..e20b0ab 100644
---- a/kernel/gnumpc.cc
-+++ b/kernel/gnumpc.cc
-@@ -8,7 +8,7 @@
- * ngc == number gnu complex
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <kernel/febase.h>
- #include <omalloc/omalloc.h>
-diff --git a/kernel/gnumpfl.cc b/kernel/gnumpfl.cc
-index 4d49b11..c3d7c5c 100644
---- a/kernel/gnumpfl.cc
-+++ b/kernel/gnumpfl.cc
-@@ -8,7 +8,7 @@
- * ngf == number gnu floats
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <kernel/febase.h>
- #include <omalloc/omalloc.h>
-diff --git a/kernel/gr_kstd2.cc b/kernel/gr_kstd2.cc
-index dc014e8..1fe8521 100644
---- a/kernel/gr_kstd2.cc
-+++ b/kernel/gr_kstd2.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT - Kernel: noncomm. alg. of Buchberger
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_PLURAL
-
-diff --git a/kernel/gring.cc b/kernel/gring.cc
-index 5abd2cb..1feb027 100644
---- a/kernel/gring.cc
-+++ b/kernel/gring.cc
-@@ -17,7 +17,7 @@
- #define OM_TRACK 5
- #endif
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_PLURAL
- #define PLURAL_INTERNAL_DECLARATIONS
-diff --git a/kernel/hdegree.cc b/kernel/hdegree.cc
-index 4706f5b..df561e6 100644
---- a/kernel/hdegree.cc
-+++ b/kernel/hdegree.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT - dimension, multiplicity, HC, kbase
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
-
- #include <kernel/structs.h>
-diff --git a/kernel/hilb.cc b/kernel/hilb.cc
-index 64abe8a..e38b0f4 100644
---- a/kernel/hilb.cc
-+++ b/kernel/hilb.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT - Hilbert series
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <kernel/febase.h>
- #include <omalloc/omalloc.h>
-diff --git a/kernel/hutil.cc b/kernel/hutil.cc
-index 4e76eb7..62788b1 100644
---- a/kernel/hutil.cc
-+++ b/kernel/hutil.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT: Utilities for staircase operations
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <kernel/febase.h>
- #include <omalloc/omalloc.h>
-diff --git a/kernel/ideals.cc b/kernel/ideals.cc
-index 8d8f8f6..d68e749 100644
---- a/kernel/ideals.cc
-+++ b/kernel/ideals.cc
-@@ -7,7 +7,7 @@
- */
-
- /* includes */
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifndef NDEBUG
- # define MYTEST 0
-diff --git a/kernel/int64vec.cc b/kernel/int64vec.cc
-index 4937c7a..2b76231 100644
---- a/kernel/int64vec.cc
-+++ b/kernel/int64vec.cc
-@@ -5,7 +5,7 @@
- /*
- * ABSTRACT: class int64vec: lists/vectors of int64
- */
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <kernel/febase.h>
- #include <kernel/int64vec.h>
-diff --git a/kernel/intvec.cc b/kernel/intvec.cc
-index 95b1fa4..a734f88 100644
---- a/kernel/intvec.cc
-+++ b/kernel/intvec.cc
-@@ -7,7 +7,7 @@
- */
- #ifndef INTVEC_CC
- #define INTVEC_CC
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/febase.h>
- #include <kernel/options.h>
- #include <kernel/intvec.h>
-diff --git a/kernel/kbuckets.cc b/kernel/kbuckets.cc
-index 0c6f388..0826e8e 100644
---- a/kernel/kbuckets.cc
-+++ b/kernel/kbuckets.cc
-@@ -3,7 +3,7 @@
- ****************************************/
- /* $Id: kbuckets.cc 14278 2011-06-14 13:49:47Z hannes $ */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <omalloc/omalloc.h>
- #include <kernel/p_polys.h>
-diff --git a/kernel/khstd.cc b/kernel/khstd.cc
-index 421afdc..1a2aa5f 100644
---- a/kernel/khstd.cc
-+++ b/kernel/khstd.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT:utils for hilbert driven kStd
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/febase.h>
- #include <kernel/options.h>
- #include <kernel/polys.h>
-diff --git a/kernel/kspoly.cc b/kernel/kspoly.cc
-index 6288e4a..0cbe7d5 100644
---- a/kernel/kspoly.cc
-+++ b/kernel/kspoly.cc
-@@ -7,7 +7,7 @@
- */
-
- // #define PDEBUG 2
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/options.h>
- #include <kernel/kutil.h>
- #include <kernel/numbers.h>
-diff --git a/kernel/kstd1.cc b/kernel/kstd1.cc
-index 1c10f05..690a9f9 100644
---- a/kernel/kstd1.cc
-+++ b/kernel/kstd1.cc
-@@ -14,7 +14,7 @@
- // define if buckets should be used
- #define MORA_USE_BUCKETS
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/omalloc.h>
-
- #ifndef NDEBUG
-diff --git a/kernel/kstd2.cc b/kernel/kstd2.cc
-index 663fc1d..b064a59 100644
---- a/kernel/kstd2.cc
-+++ b/kernel/kstd2.cc
-@@ -13,7 +13,7 @@
- // define to enable tailRings
- #define HAVE_TAIL_RING
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifndef NDEBUG
- # define MYTEST 0
-diff --git a/kernel/kstdfac.cc b/kernel/kstdfac.cc
-index 6d598e3..10c4800 100644
---- a/kernel/kstdfac.cc
-+++ b/kernel/kstdfac.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT - Kernel: factorizing alg. of Buchberger
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/omalloc.h>
- #include <kernel/options.h>
- #include <kernel/polys.h>
-diff --git a/kernel/kutil.cc b/kernel/kutil.cc
-index 2b10ea5..a464baf 100644
---- a/kernel/kutil.cc
-+++ b/kernel/kutil.cc
-@@ -10,7 +10,7 @@
- #define KUTIL_CC
- #include <stdlib.h>
- #include <string.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifndef NDEBUG
- # define MYTEST 0
-diff --git a/kernel/linearAlgebra.cc b/kernel/linearAlgebra.cc
-index a06d10e..e3f22a7 100644
---- a/kernel/linearAlgebra.cc
-+++ b/kernel/linearAlgebra.cc
-@@ -16,7 +16,7 @@
- /*****************************************************************************/
-
- // include header files
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <kernel/polys.h>
- #include <kernel/ideals.h>
-diff --git a/kernel/longalg.cc b/kernel/longalg.cc
-index 730d8a1..2e179b7 100644
---- a/kernel/longalg.cc
-+++ b/kernel/longalg.cc
-@@ -7,7 +7,7 @@
-
- #include <stdio.h>
- #include <string.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <omalloc/omalloc.h>
- #include <kernel/febase.h>
-diff --git a/kernel/longrat.cc b/kernel/longrat.cc
-index bf7614e..4370f46 100644
---- a/kernel/longrat.cc
-+++ b/kernel/longrat.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT: computation with long rational numbers (Hubert Grassmann)
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <kernel/longrat.h>
-
-diff --git a/kernel/longrat0.cc b/kernel/longrat0.cc
-index a550a2e..ee9b596 100644
---- a/kernel/longrat0.cc
-+++ b/kernel/longrat0.cc
-@@ -9,7 +9,7 @@
-
- #include <stdio.h>
- #include <string.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <omalloc/omalloc.h>
- #include <kernel/febase.h>
-diff --git a/kernel/longtrans.cc b/kernel/longtrans.cc
-index cf2ebef..88d48ab 100644
---- a/kernel/longtrans.cc
-+++ b/kernel/longtrans.cc
-@@ -9,7 +9,7 @@
- #if 0
- #include <stdio.h>
- #include <string.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <omalloc/omalloc.h>
- #include <kernel/febase.h>
-diff --git a/kernel/lplist.cc b/kernel/lplist.cc
-index cd41992..12151e9 100644
---- a/kernel/lplist.cc
-+++ b/kernel/lplist.cc
-@@ -5,7 +5,7 @@
- /*
- * ABSTRACT: list interface
- */
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_F5
-
-diff --git a/kernel/maps.cc b/kernel/maps.cc
-index c1b5023..fa6cc80 100644
---- a/kernel/maps.cc
-+++ b/kernel/maps.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT - the mapping of polynomials to other rings
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/options.h>
- #include <kernel/febase.h>
- #include <kernel/polys.h>
-diff --git a/kernel/matpol.cc b/kernel/matpol.cc
-index 5e5147f..0d9c215 100644
---- a/kernel/matpol.cc
-+++ b/kernel/matpol.cc
-@@ -10,7 +10,7 @@
- #include <stdio.h>
- #include <math.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/mylimits.h>
- #include <kernel/structs.h>
- #include <kernel/kstd1.h>
-diff --git a/kernel/misc.cc b/kernel/misc.cc
-index 4ba410c..21ecce5 100644
---- a/kernel/misc.cc
-+++ b/kernel/misc.cc
-@@ -12,7 +12,7 @@
- #include <stdlib.h>
- #include <time.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/mylimits.h>
- #include <omalloc/omalloc.h>
- #include <kernel/structs.h>
-diff --git a/kernel/mmalloc.cc b/kernel/mmalloc.cc
-index 238d10d..6659b24 100644
---- a/kernel/mmalloc.cc
-+++ b/kernel/mmalloc.cc
-@@ -7,7 +7,7 @@
- */
- #include <stdlib.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #include <omalloc/omalloc.h>
- #include <new>
-diff --git a/kernel/mmstd.c b/kernel/mmstd.c
-index e3f144a..80aeb53 100644
---- a/kernel/mmstd.c
-+++ b/kernel/mmstd.c
-@@ -7,7 +7,7 @@
- * i.e. (malloc/realloc/free)
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #include <omalloc/omalloc.h>
- #include <Singular/static.h>
-diff --git a/kernel/mod_raw.cc b/kernel/mod_raw.cc
-index e388b82..4971140 100644
---- a/kernel/mod_raw.cc
-+++ b/kernel/mod_raw.cc
-@@ -17,7 +17,7 @@
- #include <sys/stat.h>
-
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <Singular/static.h>
-
- #include <kernel/mod_raw.h>
-diff --git a/kernel/modulop.cc b/kernel/modulop.cc
-index 8b9089f..126d712 100644
---- a/kernel/modulop.cc
-+++ b/kernel/modulop.cc
-@@ -6,7 +6,7 @@
- */
-
- #include <string.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/mylimits.h>
- #include <kernel/structs.h>
- #include <kernel/febase.h>
-diff --git a/kernel/mpr_base.cc b/kernel/mpr_base.cc
-index e67757c..f1a50b9 100644
---- a/kernel/mpr_base.cc
-+++ b/kernel/mpr_base.cc
-@@ -8,7 +8,7 @@
-
- #include <math.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #include <omalloc/mylimits.h>
- #include <omalloc/omalloc.h>
-diff --git a/kernel/mpr_complex.cc b/kernel/mpr_complex.cc
-index bea595f..b5427f9 100644
---- a/kernel/mpr_complex.cc
-+++ b/kernel/mpr_complex.cc
-@@ -11,7 +11,7 @@
-
- // WARNING! ALWAYS use omAlloc and FreeL when alloc. memory for some char* !!
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- //#ifdef HAVE_MPR
- #include <kernel/structs.h>
- #include <kernel/febase.h>
-diff --git a/kernel/mpr_inout.cc b/kernel/mpr_inout.cc
-index 6957432..3499fe4 100644
---- a/kernel/mpr_inout.cc
-+++ b/kernel/mpr_inout.cc
-@@ -8,7 +8,7 @@
- * ABSTRACT - multipolynomial resultant
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- //#ifdef HAVE_MPR
-
- //-> includes
-diff --git a/kernel/mpr_numeric.cc b/kernel/mpr_numeric.cc
-index bf2e87a..10e7bd9 100644
---- a/kernel/mpr_numeric.cc
-+++ b/kernel/mpr_numeric.cc
-@@ -9,7 +9,7 @@
- * ( root finder, vandermonde system solver, simplex )
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- //#ifdef HAVE_MPR
-
- //#define mprDEBUG_ALL
-diff --git a/kernel/multicnt.cc b/kernel/multicnt.cc
-index 9f11b1d..de21ed3 100644
---- a/kernel/multicnt.cc
-+++ b/kernel/multicnt.cc
-@@ -7,7 +7,7 @@
-
- #define MULTICNT_CC
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_SPECTRUM
-
-diff --git a/kernel/ncSACache.cc b/kernel/ncSACache.cc
-index 99eaeb5..c8a23d2 100644
---- a/kernel/ncSACache.cc
-+++ b/kernel/ncSACache.cc
-@@ -18,7 +18,7 @@
- #endif
-
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifndef NDEBUG
- #define OUTPUT 1
-diff --git a/kernel/ncSAFormula.cc b/kernel/ncSAFormula.cc
-index b5c6cef..f26ddc3 100644
---- a/kernel/ncSAFormula.cc
-+++ b/kernel/ncSAFormula.cc
-@@ -18,7 +18,7 @@
- #endif
-
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_PLURAL
-
-diff --git a/kernel/ncSAMult.cc b/kernel/ncSAMult.cc
-index d562476..80ae708 100644
---- a/kernel/ncSAMult.cc
-+++ b/kernel/ncSAMult.cc
-@@ -18,7 +18,7 @@
- #endif
-
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_PLURAL
-
-diff --git a/kernel/npolygon.cc b/kernel/npolygon.cc
-index afb939b..b54d941 100644
---- a/kernel/npolygon.cc
-+++ b/kernel/npolygon.cc
-@@ -7,7 +7,7 @@
-
- #define NPOLYGON_CC
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_SPECTRUM
-
-diff --git a/kernel/numbers.cc b/kernel/numbers.cc
-index 73714de..fe59242 100644
---- a/kernel/numbers.cc
-+++ b/kernel/numbers.cc
-@@ -9,7 +9,7 @@
-
- #include <string.h>
- #include <stdlib.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <kernel/febase.h>
- #include <kernel/kstd1.h>
-diff --git a/kernel/pDebug.cc b/kernel/pDebug.cc
-index 6ce992f..68bdfb1 100644
---- a/kernel/pDebug.cc
-+++ b/kernel/pDebug.cc
-@@ -15,7 +15,7 @@
- #include <stdio.h>
-
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #ifdef PDEBUG
-
- // do the following to always enforce checking of pSetm
-diff --git a/kernel/pInline0.cc b/kernel/pInline0.cc
-index 4160627..73a9de7 100644
---- a/kernel/pInline0.cc
-+++ b/kernel/pInline0.cc
-@@ -10,7 +10,7 @@
- *******************************************************************/
- #ifndef PINLINE0_CC
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #define PINLINE0_CC
- #undef DO_PINLINE0
-diff --git a/kernel/pInline1.cc b/kernel/pInline1.cc
-index 68bf114..a1ad691 100644
---- a/kernel/pInline1.cc
-+++ b/kernel/pInline1.cc
-@@ -11,7 +11,7 @@
- #ifndef PINLINE1_CC
- #define PINLINE1_CC
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef PDEBUG
-
-diff --git a/kernel/pInline2.cc b/kernel/pInline2.cc
-index 5aafa5b..c8229b4 100644
---- a/kernel/pInline2.cc
-+++ b/kernel/pInline2.cc
-@@ -10,7 +10,7 @@
- *******************************************************************/
- #ifndef PINLINE2_CC
- #define PINLINE2_CC
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef PDEBUG
-
-diff --git a/kernel/pShallowCopyDelete.cc b/kernel/pShallowCopyDelete.cc
-index 3aef21c..aa32ca7 100644
---- a/kernel/pShallowCopyDelete.cc
-+++ b/kernel/pShallowCopyDelete.cc
-@@ -8,7 +8,7 @@
- * Created: 8/00
- * Version: $Id: pShallowCopyDelete.cc 13032 2010-07-17 20:38:50Z krueger $
- *******************************************************************/
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/p_polys.h>
- #include <kernel/ring.h>
- #include <kernel/pShallowCopyDelete.h>
-diff --git a/kernel/p_Mult_q.cc b/kernel/p_Mult_q.cc
-index a638570..35f2349 100644
---- a/kernel/p_Mult_q.cc
-+++ b/kernel/p_Mult_q.cc
-@@ -8,7 +8,7 @@
- * Created: 8/00
- * Version: $Id: p_Mult_q.cc 13032 2010-07-17 20:38:50Z krueger $
- *******************************************************************/
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- /***************************************************************
- *
-diff --git a/kernel/p_Mult_q.h b/kernel/p_Mult_q.h
-index 9000e51..87f57ee 100644
---- a/kernel/p_Mult_q.h
-+++ b/kernel/p_Mult_q.h
-@@ -9,7 +9,7 @@
- * Created: 8/00
- * Version: $Id: p_Mult_q.h 13032 2010-07-17 20:38:50Z krueger $
- *******************************************************************/
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
-
- // Use buckets if min(pLength(p), pLength(q)) >= MIN_LENGTH_BUCKET
-diff --git a/kernel/p_Procs_Dynamic.cc b/kernel/p_Procs_Dynamic.cc
-index 9e8bd31..800c3d4 100644
---- a/kernel/p_Procs_Dynamic.cc
-+++ b/kernel/p_Procs_Dynamic.cc
-@@ -8,7 +8,7 @@
- * Created: 12/00
- * Version: $Id: p_Procs_Dynamic.cc 13051 2010-07-22 14:33:35Z hannes $
- *******************************************************************/
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <kernel/p_polys.h>
- #include <kernel/ring.h>
-diff --git a/kernel/p_Procs_Generate.cc b/kernel/p_Procs_Generate.cc
-index 5733285..3b25bac 100644
---- a/kernel/p_Procs_Generate.cc
-+++ b/kernel/p_Procs_Generate.cc
-@@ -15,7 +15,7 @@
- #include <stdlib.h>
- #include <string.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/dError.c>
-
- #ifdef p_Procs_Static
-diff --git a/kernel/p_Procs_Lib.cc b/kernel/p_Procs_Lib.cc
-index 33a3b9f..28bcdfb 100644
---- a/kernel/p_Procs_Lib.cc
-+++ b/kernel/p_Procs_Lib.cc
-@@ -8,7 +8,7 @@
- * Created: 12/00
- * Version: $Id: p_Procs_Lib.cc 13052 2010-07-22 14:34:50Z hannes $
- *******************************************************************/
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <kernel/p_polys.h>
- #include <kernel/ring.h>
-diff --git a/kernel/p_Procs_Static.cc b/kernel/p_Procs_Static.cc
-index c7b571a..ad11c01 100644
---- a/kernel/p_Procs_Static.cc
-+++ b/kernel/p_Procs_Static.cc
-@@ -8,7 +8,7 @@
- * Created: 12/00
- * Version: $Id: p_Procs_Static.cc 13051 2010-07-22 14:33:35Z hannes $
- *******************************************************************/
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <kernel/p_polys.h>
- #include <kernel/ring.h>
-diff --git a/kernel/p_polys.cc b/kernel/p_polys.cc
-index 70c2bd2..32a84b3 100644
---- a/kernel/p_polys.cc
-+++ b/kernel/p_polys.cc
-@@ -10,7 +10,7 @@
- *******************************************************************/
-
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #include <kernel/structs.h>
- #include <kernel/p_polys.h>
-diff --git a/kernel/page.c b/kernel/page.c
-index 19681d5..4011a14 100644
---- a/kernel/page.c
-+++ b/kernel/page.c
-@@ -1,4 +1,4 @@
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #ifdef PAGE_TEST
- #include <stdlib.h>
- #include <unistd.h>
-diff --git a/kernel/polys-impl.cc b/kernel/polys-impl.cc
-index 8afebcd..f0206f9 100644
---- a/kernel/polys-impl.cc
-+++ b/kernel/polys-impl.cc
-@@ -18,7 +18,7 @@
-
- #include <stdio.h>
- #include <string.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #include <omalloc/omalloc.h>
- #ifdef PDEBUG
-diff --git a/kernel/polys.cc b/kernel/polys.cc
-index 65b0049..443994f 100644
---- a/kernel/polys.cc
-+++ b/kernel/polys.cc
-@@ -11,7 +11,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/options.h>
- #include <omalloc/omalloc.h>
- #include <kernel/febase.h>
-diff --git a/kernel/polys0.cc b/kernel/polys0.cc
-index 2047151..6d24da9 100644
---- a/kernel/polys0.cc
-+++ b/kernel/polys0.cc
-@@ -8,7 +8,7 @@
- */
-
- /* includes */
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <kernel/numbers.h>
- #include <kernel/ring.h>
-diff --git a/kernel/polys1.cc b/kernel/polys1.cc
-index b7e6c35..382631d 100644
---- a/kernel/polys1.cc
-+++ b/kernel/polys1.cc
-@@ -10,7 +10,7 @@
-
- /* includes */
- #include <string.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/options.h>
- #include <kernel/numbers.h>
- #include <kernel/ffields.h>
-diff --git a/kernel/prCopy.cc b/kernel/prCopy.cc
-index 1d7064d..9d26195 100644
---- a/kernel/prCopy.cc
-+++ b/kernel/prCopy.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT - implementation of functions for Copy/Move/Delete for Polys
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/omalloc.h>
- #include <kernel/p_polys.h>
- #include <kernel/numbers.h>
-diff --git a/kernel/ratgring.cc b/kernel/ratgring.cc
-index bc8697b..c88937c 100644
---- a/kernel/ratgring.cc
-+++ b/kernel/ratgring.cc
-@@ -8,7 +8,7 @@
- * Created: 8/00 - 11/00
- * Version: $Id: ratgring.cc 13262 2010-09-23 15:01:24Z levandov $
- *******************************************************************/
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/ratgring.h>
- #ifdef HAVE_RATGRING
- #include <kernel/gring.h>
-diff --git a/kernel/ring.cc b/kernel/ring.cc
-index 418c3cb..477a73b 100644
---- a/kernel/ring.cc
-+++ b/kernel/ring.cc
-@@ -9,7 +9,7 @@
-
- /* includes */
- #include <math.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #include <kernel/options.h>
- #include <omalloc/omalloc.h>
-diff --git a/kernel/ringgb.cc b/kernel/ringgb.cc
-index 9f3814b..2bbb4fb 100644
---- a/kernel/ringgb.cc
-+++ b/kernel/ringgb.cc
-@@ -8,7 +8,7 @@
- //#define HAVE_TAIL_RING
- #define NO_BUCKETS
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/kutil.h>
- #include <kernel/structs.h>
- #include <omalloc/omalloc.h>
-diff --git a/kernel/ringgb.h b/kernel/ringgb.h
-index 79b8858..9921213 100644
---- a/kernel/ringgb.h
-+++ b/kernel/ringgb.h
-@@ -7,7 +7,7 @@
- */
- #ifndef RINGGB_HEADER
- #define RINGGB_HEADER
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_RINGS
- #include <kernel/polys.h>
-diff --git a/kernel/rintegers.cc b/kernel/rintegers.cc
-index 95b1f15..86b10f6 100644
---- a/kernel/rintegers.cc
-+++ b/kernel/rintegers.cc
-@@ -7,7 +7,7 @@
- */
-
- #include <string.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/mylimits.h>
- #include <kernel/structs.h>
- #include <kernel/febase.h>
-diff --git a/kernel/rmodulo2m.cc b/kernel/rmodulo2m.cc
-index 3c61878..986174a 100644
---- a/kernel/rmodulo2m.cc
-+++ b/kernel/rmodulo2m.cc
-@@ -7,7 +7,7 @@
- */
-
- #include <string.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_RINGS
- #include <omalloc/mylimits.h>
-diff --git a/kernel/rmodulon.cc b/kernel/rmodulon.cc
-index b2a05b5..cfbe541 100644
---- a/kernel/rmodulon.cc
-+++ b/kernel/rmodulon.cc
-@@ -7,7 +7,7 @@
- */
-
- #include <string.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/mylimits.h>
- #include <kernel/structs.h>
- #include <kernel/febase.h>
-diff --git a/kernel/sbuckets.cc b/kernel/sbuckets.cc
-index 839c7c8..6d4a110 100644
---- a/kernel/sbuckets.cc
-+++ b/kernel/sbuckets.cc
-@@ -9,7 +9,7 @@
- * Created: 9/00
- * Version: $Id: sbuckets.cc 13210 2010-09-17 13:36:19Z seelisch $
- *******************************************************************/
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #include <kernel/sbuckets.h>
- #include <omalloc/omalloc.h>
-diff --git a/kernel/sca.cc b/kernel/sca.cc
-index 6147086..ff2cd80 100644
---- a/kernel/sca.cc
-+++ b/kernel/sca.cc
-@@ -19,7 +19,7 @@
- #endif
-
- // #define PDEBUG 2
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_PLURAL
- // for
-diff --git a/kernel/semic.cc b/kernel/semic.cc
-index fed3484..dced520 100644
---- a/kernel/semic.cc
-+++ b/kernel/semic.cc
-@@ -7,7 +7,7 @@
-
- #define SEMIC_CC
-
--#include"mod2.h"
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_SPECTRUM
-
-diff --git a/kernel/shiftgb.cc b/kernel/shiftgb.cc
-index 3dc9189..6be6893 100644
---- a/kernel/shiftgb.cc
-+++ b/kernel/shiftgb.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT: kernel: utils for shift GB and free GB
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_SHIFTBBA
- #include <kernel/febase.h>
-diff --git a/kernel/shortfl.cc b/kernel/shortfl.cc
-index 9bed2bb..dd29897 100644
---- a/kernel/shortfl.cc
-+++ b/kernel/shortfl.cc
-@@ -8,7 +8,7 @@
- */
-
- #include <string.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/mylimits.h>
- #include <kernel/structs.h>
- #include <kernel/febase.h>
-diff --git a/kernel/sparsmat.cc b/kernel/sparsmat.cc
-index 2bfbde6..9626efd 100644
---- a/kernel/sparsmat.cc
-+++ b/kernel/sparsmat.cc
-@@ -7,7 +7,7 @@
- * ABSTRACT: operations with sparse matrices (bareiss, ...)
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/options.h>
- #include <kernel/febase.h>
- #include <kernel/intvec.h>
-diff --git a/kernel/spectrum.cc b/kernel/spectrum.cc
-index 1671a6e..98a8f4f 100644
---- a/kernel/spectrum.cc
-+++ b/kernel/spectrum.cc
-@@ -7,7 +7,7 @@
-
- #define SPECTRUM_CC
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_SPECTRUM
-
-diff --git a/kernel/splist.cc b/kernel/splist.cc
-index c1db0ae..7a4b65a 100644
---- a/kernel/splist.cc
-+++ b/kernel/splist.cc
-@@ -7,7 +7,7 @@
-
- #define SPLIST_CC
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- #ifdef HAVE_SPECTRUM
-
-diff --git a/kernel/summator.cc b/kernel/summator.cc
-index be1cb41..8814eae 100644
---- a/kernel/summator.cc
-+++ b/kernel/summator.cc
-@@ -18,7 +18,7 @@
- #define OM_TRACK 5
- #endif
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #ifdef HAVE_PLURAL
- #include <kernel/summator.h>
- #include <kernel/options.h>
-diff --git a/kernel/syz.cc b/kernel/syz.cc
-index 1061e56..eecb98c 100644
---- a/kernel/syz.cc
-+++ b/kernel/syz.cc
-@@ -8,7 +8,7 @@
- */
-
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/options.h>
- #include <omalloc/omalloc.h>
- #include <kernel/polys.h>
-diff --git a/kernel/syz0.cc b/kernel/syz0.cc
-index c2d8cbe..69e2c44 100644
---- a/kernel/syz0.cc
-+++ b/kernel/syz0.cc
-@@ -7,7 +7,7 @@
- */
-
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/options.h>
- #include <omalloc/omalloc.h>
- #include <kernel/polys.h>
-diff --git a/kernel/syz1.cc b/kernel/syz1.cc
-index 1367c52..7aea035 100644
---- a/kernel/syz1.cc
-+++ b/kernel/syz1.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT: resolutions
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/mylimits.h>
- #include <kernel/options.h>
- #include <omalloc/omalloc.h>
-diff --git a/kernel/syz2.cc b/kernel/syz2.cc
-index 636001d..67b6310 100644
---- a/kernel/syz2.cc
-+++ b/kernel/syz2.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT: resolutions
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/mylimits.h>
- #include <kernel/options.h>
- #include <omalloc/omalloc.h>
-diff --git a/kernel/syz3.cc b/kernel/syz3.cc
-index aff65e7..e225cd1 100644
---- a/kernel/syz3.cc
-+++ b/kernel/syz3.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT: resolutions
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/mylimits.h>
- #include <kernel/options.h>
- #include <omalloc/omalloc.h>
-diff --git a/kernel/tgb.cc b/kernel/tgb.cc
-index c92976e..b226497 100644
---- a/kernel/tgb.cc
-+++ b/kernel/tgb.cc
-@@ -14,7 +14,7 @@
- ///@TODO: delay nur auf Sugarvergr?erung
- ///@TODO: grade aus ecartS, setze dazu strat->honey; und nutze p.ecart
- ///@TODO: no tail reductions in syz comp
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/options.h>
- #include <kernel/tgb.h>
- #include <kernel/tgb_internal.h>
-diff --git a/kernel/tgbgauss.cc b/kernel/tgbgauss.cc
-index 681a38a..ed14563 100644
---- a/kernel/tgbgauss.cc
-+++ b/kernel/tgbgauss.cc
-@@ -5,7 +5,7 @@
- /*
- * ABSTRACT: gauss implementation for F4
- */
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/options.h>
- #include <kernel/tgbgauss.h>
- #include <omalloc/omalloc.h>
-diff --git a/kernel/tgbgauss.h b/kernel/tgbgauss.h
-index 3c9ab04..dc6cbc1 100644
---- a/kernel/tgbgauss.h
-+++ b/kernel/tgbgauss.h
-@@ -7,7 +7,7 @@
- /*
- * ABSTRACT: gauss implementation for F4 header
- */
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/numbers.h>
- //#include "tgb_internal.h"
-
-diff --git a/kernel/timer.cc b/kernel/timer.cc
-index 06d1ff4..a6ceedc 100644
---- a/kernel/timer.cc
-+++ b/kernel/timer.cc
-@@ -9,7 +9,7 @@
- #include <sys/resource.h>
- #include <unistd.h>
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
-
- int timerv = 0;
- static double timer_resolution = TIMER_RESOLUTION;
-diff --git a/kernel/tmult.cc b/kernel/tmult.cc
-index 99113d9..05e8d8c 100644
---- a/kernel/tmult.cc
-+++ b/kernel/tmult.cc
-@@ -5,7 +5,7 @@
- *
- * Version: $Id: tmult.cc 14320 2011-07-04 14:48:27Z hannes $
- *******************************************************************/
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <kernel/numbers.h>
- #include <kernel/polys.h>
-diff --git a/kernel/units.cc b/kernel/units.cc
-index 854dc5f..f15d0d9 100644
---- a/kernel/units.cc
-+++ b/kernel/units.cc
-@@ -6,7 +6,7 @@
- * ABSTRACT: procedures to compute with units
- */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <kernel/febase.h>
- #include <kernel/numbers.h>
-diff --git a/kernel/walkMain.cc b/kernel/walkMain.cc
-index 762a36a..6ca067c 100644
---- a/kernel/walkMain.cc
-+++ b/kernel/walkMain.cc
-@@ -7,7 +7,7 @@
- *
- */
- #include <string.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/options.h>
- #include <kernel/intvec.h>
- #include <kernel/int64vec.h>
-diff --git a/kernel/walkProc.cc b/kernel/walkProc.cc
-index f90020a..223a9ca 100644
---- a/kernel/walkProc.cc
-+++ b/kernel/walkProc.cc
-@@ -3,7 +3,7 @@
- ****************************************/
- /* $Id: walkProc.cc 13210 2010-09-17 13:36:19Z seelisch $ */
-
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/structs.h>
- #include <kernel/structs.h>
- #include <kernel/polys.h>
-diff --git a/kernel/walkSupport.cc b/kernel/walkSupport.cc
-index ea9c1fa..ada42f7 100644
---- a/kernel/walkSupport.cc
-+++ b/kernel/walkSupport.cc
-@@ -1,5 +1,5 @@
- #include <string.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/intvec.h>
- #include <kernel/int64vec.h>
- #include <kernel/polys.h>
-diff --git a/kernel/weight.cc b/kernel/weight.cc
-index b1ea7d1..ee073aa 100644
---- a/kernel/weight.cc
-+++ b/kernel/weight.cc
-@@ -8,7 +8,7 @@
- */
-
- #include <math.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <kernel/options.h>
- #include <omalloc/omalloc.h>
- #include <kernel/polys.h>
-diff --git a/kernel/weight0.c b/kernel/weight0.c
-index 3efb3a7..ffbe6a4 100644
---- a/kernel/weight0.c
-+++ b/kernel/weight0.c
-@@ -9,7 +9,7 @@
-
- #include <math.h>
- #include <string.h>
--#include <kernel/mod2.h>
-+#include <Singular/mod2.h>
- #include <omalloc/omalloc.h>
- #include <kernel/structs.h>
-
diff --git a/debian/patches/0010-keep-mod2.h-in-Singular.patch b/debian/patches/0010-keep-mod2.h-in-Singular.patch
new file mode 100644
index 0000000..332980d
--- /dev/null
+++ b/debian/patches/0010-keep-mod2.h-in-Singular.patch
@@ -0,0 +1,2493 @@
+From 2e1607c26618e7cac6be6bf48d866f23a40ff47f Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Wed, 22 Feb 2012 11:18:38 +0100
+Subject: keep mod2.h in Singular/
+
+don't copy mod2.h generated in Singular/ to kernel/
+to avoid time stamp issues
+---
+ Singular/Makefile.in | 2 +-
+ Singular/Minor.cc | 2 +-
+ Singular/MinorInterface.cc | 2 +-
+ Singular/MinorProcessor.cc | 2 +-
+ Singular/attrib.cc | 2 +-
+ Singular/calcSVD.cc | 2 +-
+ Singular/claptmpl.cc | 2 +-
+ Singular/cntrlc.cc | 2 +-
+ Singular/configure | 1 -
+ Singular/configure.in | 1 -
+ Singular/eigenval_ip.cc | 2 +-
+ Singular/emacs.cc | 2 +-
+ Singular/extra.cc | 2 +-
+ Singular/feOpt.cc | 2 +-
+ Singular/fehelp.cc | 2 +-
+ Singular/fglm.cc | 2 +-
+ Singular/gms.cc | 2 +-
+ Singular/grammar.cc | 2 +-
+ Singular/grammar.y | 2 +-
+ Singular/interpolation.cc | 2 +-
+ Singular/iparith.cc | 2 +-
+ Singular/ipassign.cc | 2 +-
+ Singular/ipconv.cc | 2 +-
+ Singular/ipid.cc | 2 +-
+ Singular/iplib.cc | 2 +-
+ Singular/ipprint.cc | 2 +-
+ Singular/ipshell.cc | 2 +-
+ Singular/janet.cc | 2 +-
+ Singular/libparse.l | 2 +-
+ Singular/lists.cc | 2 +-
+ Singular/maps_ip.cc | 2 +-
+ Singular/minpoly.cc | 2 +-
+ Singular/misc_ip.cc | 2 +-
+ Singular/mpsr_Error.cc | 2 +-
+ Singular/mpsr_Get.cc | 2 +-
+ Singular/mpsr_GetMisc.cc | 2 +-
+ Singular/mpsr_GetPoly.cc | 2 +-
+ Singular/mpsr_Put.cc | 2 +-
+ Singular/mpsr_PutPoly.cc | 2 +-
+ Singular/mpsr_Tok.cc | 2 +-
+ Singular/mpsr_sl.cc | 2 +-
+ Singular/ndbm.cc | 2 +-
+ Singular/pcv.cc | 2 +-
+ Singular/pipeLink.cc | 2 +-
+ Singular/scanner.cc | 2 +-
+ Singular/scanner.l | 2 +-
+ Singular/sdb.cc | 2 +-
+ Singular/silink.cc | 2 +-
+ Singular/sing_dbm.cc | 2 +-
+ Singular/sing_win.cc | 2 +-
+ Singular/slInit_Dynamic.cc | 2 +-
+ Singular/slInit_Static.cc | 2 +-
+ Singular/ssiLink.cc | 2 +-
+ Singular/subexpr.cc | 2 +-
+ Singular/tesths.cc | 2 +-
+ Singular/walk.cc | 2 +-
+ Singular/walk_ip.cc | 2 +-
+ Singular/wrapper.cc | 2 +-
+ kernel/F4.cc | 2 +-
+ kernel/F5cData.cc | 2 +-
+ kernel/F5cLists.cc | 2 +-
+ kernel/GMPrat.cc | 2 +-
+ kernel/Number.h | 2 +-
+ kernel/Poly.h | 2 +-
+ kernel/PowerSeries.h | 2 +-
+ kernel/clapconv.cc | 2 +-
+ kernel/clapsing.cc | 2 +-
+ kernel/dError.c | 2 +-
+ kernel/digitech.cc | 2 +-
+ kernel/digitech.h | 2 +-
+ kernel/eigenval.cc | 2 +-
+ kernel/f5c.cc | 2 +-
+ kernel/f5data.cc | 2 +-
+ kernel/f5gb.cc | 2 +-
+ kernel/f5lists.cc | 2 +-
+ kernel/fast_maps.cc | 2 +-
+ kernel/fast_mult.cc | 2 +-
+ kernel/fast_mult.h | 2 +-
+ kernel/feResource.cc | 2 +-
+ kernel/febase.cc | 2 +-
+ kernel/fegetopt.c | 2 +-
+ kernel/feread.cc | 2 +-
+ kernel/fereadl.c | 2 +-
+ kernel/ffields.cc | 2 +-
+ kernel/fglmcomb.cc | 2 +-
+ kernel/fglmgauss.cc | 2 +-
+ kernel/fglmhom.cc | 2 +-
+ kernel/fglmvec.cc | 2 +-
+ kernel/fglmzero.cc | 2 +-
+ kernel/gfan.cc | 2 +-
+ kernel/gnumpc.cc | 2 +-
+ kernel/gnumpfl.cc | 2 +-
+ kernel/gr_kstd2.cc | 2 +-
+ kernel/gring.cc | 2 +-
+ kernel/hdegree.cc | 2 +-
+ kernel/hilb.cc | 2 +-
+ kernel/hutil.cc | 2 +-
+ kernel/ideals.cc | 2 +-
+ kernel/int64vec.cc | 2 +-
+ kernel/intvec.cc | 2 +-
+ kernel/kbuckets.cc | 2 +-
+ kernel/khstd.cc | 2 +-
+ kernel/kspoly.cc | 2 +-
+ kernel/kstd1.cc | 2 +-
+ kernel/kstd2.cc | 2 +-
+ kernel/kstdfac.cc | 2 +-
+ kernel/kutil.cc | 2 +-
+ kernel/linearAlgebra.cc | 2 +-
+ kernel/longalg.cc | 2 +-
+ kernel/longrat.cc | 2 +-
+ kernel/longrat0.cc | 2 +-
+ kernel/longtrans.cc | 2 +-
+ kernel/lplist.cc | 2 +-
+ kernel/maps.cc | 2 +-
+ kernel/matpol.cc | 2 +-
+ kernel/misc.cc | 2 +-
+ kernel/mmalloc.cc | 2 +-
+ kernel/mmstd.c | 2 +-
+ kernel/mod_raw.cc | 2 +-
+ kernel/modulop.cc | 2 +-
+ kernel/mpr_base.cc | 2 +-
+ kernel/mpr_complex.cc | 2 +-
+ kernel/mpr_inout.cc | 2 +-
+ kernel/mpr_numeric.cc | 2 +-
+ kernel/multicnt.cc | 2 +-
+ kernel/ncSACache.cc | 2 +-
+ kernel/ncSAFormula.cc | 2 +-
+ kernel/ncSAMult.cc | 2 +-
+ kernel/npolygon.cc | 2 +-
+ kernel/numbers.cc | 2 +-
+ kernel/pDebug.cc | 2 +-
+ kernel/pInline0.cc | 2 +-
+ kernel/pInline1.cc | 2 +-
+ kernel/pInline2.cc | 2 +-
+ kernel/pShallowCopyDelete.cc | 2 +-
+ kernel/p_Mult_q.cc | 2 +-
+ kernel/p_Mult_q.h | 2 +-
+ kernel/p_Procs_Dynamic.cc | 2 +-
+ kernel/p_Procs_Generate.cc | 2 +-
+ kernel/p_Procs_Lib.cc | 2 +-
+ kernel/p_Procs_Static.cc | 2 +-
+ kernel/p_polys.cc | 2 +-
+ kernel/page.c | 2 +-
+ kernel/polys-impl.cc | 2 +-
+ kernel/polys.cc | 2 +-
+ kernel/polys0.cc | 2 +-
+ kernel/polys1.cc | 2 +-
+ kernel/prCopy.cc | 2 +-
+ kernel/ratgring.cc | 2 +-
+ kernel/ring.cc | 2 +-
+ kernel/ringgb.cc | 2 +-
+ kernel/ringgb.h | 2 +-
+ kernel/rintegers.cc | 2 +-
+ kernel/rmodulo2m.cc | 2 +-
+ kernel/rmodulon.cc | 2 +-
+ kernel/sbuckets.cc | 2 +-
+ kernel/sca.cc | 2 +-
+ kernel/semic.cc | 2 +-
+ kernel/shiftgb.cc | 2 +-
+ kernel/shortfl.cc | 2 +-
+ kernel/sparsmat.cc | 2 +-
+ kernel/spectrum.cc | 2 +-
+ kernel/splist.cc | 2 +-
+ kernel/summator.cc | 2 +-
+ kernel/syz.cc | 2 +-
+ kernel/syz0.cc | 2 +-
+ kernel/syz1.cc | 2 +-
+ kernel/syz2.cc | 2 +-
+ kernel/syz3.cc | 2 +-
+ kernel/tgb.cc | 2 +-
+ kernel/tgbgauss.cc | 2 +-
+ kernel/tgbgauss.h | 2 +-
+ kernel/timer.cc | 2 +-
+ kernel/tmult.cc | 2 +-
+ kernel/units.cc | 2 +-
+ kernel/walkMain.cc | 2 +-
+ kernel/walkProc.cc | 2 +-
+ kernel/walkSupport.cc | 2 +-
+ kernel/weight.cc | 2 +-
+ kernel/weight0.c | 2 +-
+ 180 files changed, 178 insertions(+), 180 deletions(-)
+
+diff --git a/Singular/Makefile.in b/Singular/Makefile.in
+index 55b13f11..890b347 100644
+--- a/Singular/Makefile.in
++++ b/Singular/Makefile.in
+@@ -605,7 +605,7 @@ install-libsingular: libsingular
+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
+ done
+ ${INSTALL_PROGRAM} libsingular.h $(DESTDIR)${includedir}
+- for file in subexpr.h tok.h grammar.h ipid.h lists.h ipshell.h attrib.h; do \
++ for file in mod2.h subexpr.h tok.h grammar.h ipid.h lists.h ipshell.h attrib.h; do \
+ sed -e "s:<kernel/:<singular/:" < $$file |sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" >$(DESTDIR)${includedir}/singular/$$file ;\
+ done
+
+diff --git a/Singular/Minor.cc b/Singular/Minor.cc
+index 402d7e6..4e358c5 100644
+--- a/Singular/Minor.cc
++++ b/Singular/Minor.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/polys.h>
+ #include <Minor.h>
+diff --git a/Singular/MinorInterface.cc b/Singular/MinorInterface.cc
+index 50ceae8..8d2a1c4 100644
+--- a/Singular/MinorInterface.cc
++++ b/Singular/MinorInterface.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/polys.h>
+ #include <kernel/ideals.h>
+diff --git a/Singular/MinorProcessor.cc b/Singular/MinorProcessor.cc
+index 1c08156..6ff81aa 100644
+--- a/Singular/MinorProcessor.cc
++++ b/Singular/MinorProcessor.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/polys.h>
+ #include <MinorProcessor.h>
+diff --git a/Singular/attrib.cc b/Singular/attrib.cc
+index 570f4e2..8d9e38b 100644
+--- a/Singular/attrib.cc
++++ b/Singular/attrib.cc
+@@ -13,7 +13,7 @@
+ #include <ctype.h>
+ #include <unistd.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/options.h>
+ #include <Singular/tok.h>
+diff --git a/Singular/calcSVD.cc b/Singular/calcSVD.cc
+index bf80b3c..1e889dd 100644
+--- a/Singular/calcSVD.cc
++++ b/Singular/calcSVD.cc
+@@ -1,5 +1,5 @@
+ #include <stdio.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_SVD
+
+diff --git a/Singular/claptmpl.cc b/Singular/claptmpl.cc
+index 1038422..6b33638 100644
+--- a/Singular/claptmpl.cc
++++ b/Singular/claptmpl.cc
+@@ -7,7 +7,7 @@
+ * ABSTRACT - instantiation of all templates
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ //#include <vector>
+ //using namespace std;
+ #ifdef HAVE_FACTORY
+diff --git a/Singular/cntrlc.cc b/Singular/cntrlc.cc
+index c327a19..5d0a81f 100644
+--- a/Singular/cntrlc.cc
++++ b/Singular/cntrlc.cc
+@@ -17,7 +17,7 @@
+ #include <signal.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+ #include <Singular/tok.h>
+ #include <Singular/ipshell.h>
+diff --git a/Singular/configure b/Singular/configure
+index 6615b4a..a173565 100755
+--- a/Singular/configure
++++ b/Singular/configure
+@@ -6343,7 +6343,6 @@ cat >> $CONFIG_STATUS <<EOF
+ EOF
+ cat >> $CONFIG_STATUS <<\EOF
+ \
+- cp mod2.h ../kernel/mod2.h; \
+ if test "$CONFIG_HEADERS"; then echo timestamp > stamp-h; fi
+ exit 0
+ EOF
+diff --git a/Singular/configure.in b/Singular/configure.in
+index 9442595..ac9aab5 100644
+--- a/Singular/configure.in
++++ b/Singular/configure.in
+@@ -1374,5 +1374,4 @@ if test "$ac_cv_singuname" = "ix86-Win"; then
+ fi
+
+ AC_OUTPUT(${OUTPUT_MAKEFILES}, \
+- cp mod2.h ../kernel/mod2.h; \
+ if test "$CONFIG_HEADERS"; then echo timestamp > stamp-h; fi)
+diff --git a/Singular/eigenval_ip.cc b/Singular/eigenval_ip.cc
+index 8a69599..7ae982d 100644
+--- a/Singular/eigenval_ip.cc
++++ b/Singular/eigenval_ip.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: eigenvalues of constant square matrices
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_EIGENVAL
+
+diff --git a/Singular/emacs.cc b/Singular/emacs.cc
+index ced2f19..19e2f43 100644
+--- a/Singular/emacs.cc
++++ b/Singular/emacs.cc
+@@ -18,7 +18,7 @@
+ #ifdef ix86_Win
+ #include <windows.h>
+ #endif
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/version.h>
+ #include <omalloc/omalloc.h>
+
+diff --git a/Singular/extra.cc b/Singular/extra.cc
+index 9a8f021..47ec69b 100644
+--- a/Singular/extra.cc
++++ b/Singular/extra.cc
+@@ -12,7 +12,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <signal.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <misc_ip.h>
+
+ #ifdef TIME_WITH_SYS_TIME
+diff --git a/Singular/feOpt.cc b/Singular/feOpt.cc
+index 2421ba0..17308fa 100644
+--- a/Singular/feOpt.cc
++++ b/Singular/feOpt.cc
+@@ -8,7 +8,7 @@
+
+ #include <string.h>
+ #include <stdlib.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/feOpt.h>
+ #if !defined(GENERATE_OPTION_INDEX) && !defined(ESINGULAR) && !defined(TSINGULAR)
+ #include <kernel/options.h>
+diff --git a/Singular/fehelp.cc b/Singular/fehelp.cc
+index 3c39bf9..305330a 100644
+--- a/Singular/fehelp.cc
++++ b/Singular/fehelp.cc
+@@ -13,7 +13,7 @@
+ #include <stdlib.h>
+ #include <time.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <Singular/tok.h>
+ #include <omalloc/omalloc.h>
+diff --git a/Singular/fglm.cc b/Singular/fglm.cc
+index 41b489b..71f4cb3 100644
+--- a/Singular/fglm.cc
++++ b/Singular/fglm.cc
+@@ -16,7 +16,7 @@
+ * lying in a 0-dimensional ideal.
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_FACTORY
+ #include <Singular/tok.h>
+diff --git a/Singular/gms.cc b/Singular/gms.cc
+index 7e7880e..1b19df4 100644
+--- a/Singular/gms.cc
++++ b/Singular/gms.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: Gauss-Manin system normal form
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_GMS
+
+diff --git a/Singular/grammar.cc b/Singular/grammar.cc
+index 72ca79a..7caf741 100644
+--- a/Singular/grammar.cc
++++ b/Singular/grammar.cc
+@@ -319,7 +319,7 @@
+ #include <stdarg.h>
+ #include <string.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <omalloc/omalloc.h>
+ #include <Singular/tok.h>
+diff --git a/Singular/grammar.y b/Singular/grammar.y
+index e3cfc5b..afc979a 100644
+--- a/Singular/grammar.y
++++ b/Singular/grammar.y
+@@ -12,7 +12,7 @@
+ #include <stdarg.h>
+ #include <string.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <omalloc/omalloc.h>
+ #include <Singular/tok.h>
+diff --git a/Singular/interpolation.cc b/Singular/interpolation.cc
+index c93edd7..5716d4a 100644
+--- a/Singular/interpolation.cc
++++ b/Singular/interpolation.cc
+@@ -3,7 +3,7 @@
+ ****************************************/
+ /* $Id: interpolation.cc 14320 2011-07-04 14:48:27Z hannes $ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <kernel/febase.h>
+ #include <kernel/ideals.h>
+diff --git a/Singular/iparith.cc b/Singular/iparith.cc
+index 884d724..fd51f29 100644
+--- a/Singular/iparith.cc
++++ b/Singular/iparith.cc
+@@ -12,7 +12,7 @@
+ #include <time.h>
+ #include <unistd.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <kernel/options.h>
+ #include <Singular/ipid.h>
+diff --git a/Singular/ipassign.cc b/Singular/ipassign.cc
+index 76d25d3..9a0b0ac 100644
+--- a/Singular/ipassign.cc
++++ b/Singular/ipassign.cc
+@@ -12,7 +12,7 @@
+ #include <string.h>
+ #include <ctype.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <kernel/options.h>
+ #include <Singular/ipid.h>
+diff --git a/Singular/ipconv.cc b/Singular/ipconv.cc
+index 202ddf1..0c8e1b5 100644
+--- a/Singular/ipconv.cc
++++ b/Singular/ipconv.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: automatic type conversions
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <Singular/ipid.h>
+ #include <kernel/intvec.h>
+diff --git a/Singular/ipid.cc b/Singular/ipid.cc
+index a989211..c36198c 100644
+--- a/Singular/ipid.cc
++++ b/Singular/ipid.cc
+@@ -7,7 +7,7 @@
+
+ #include <string.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/static.h>
+ #include <omalloc/omalloc.h>
+ #include <Singular/tok.h>
+diff --git a/Singular/iplib.cc b/Singular/iplib.cc
+index bccbc4c..821e92a 100644
+--- a/Singular/iplib.cc
++++ b/Singular/iplib.cc
+@@ -11,7 +11,7 @@
+ #include <ctype.h>
+ #include <sys/stat.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/static.h>
+ #include <Singular/tok.h>
+ #include <kernel/options.h>
+diff --git a/Singular/ipprint.cc b/Singular/ipprint.cc
+index 6adf3a1..16a05d8 100644
+--- a/Singular/ipprint.cc
++++ b/Singular/ipprint.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: interpreter: printing
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <Singular/ipid.h>
+ #include <omalloc/omalloc.h>
+diff --git a/Singular/ipshell.cc b/Singular/ipshell.cc
+index c4553fc..2aec463 100644
+--- a/Singular/ipshell.cc
++++ b/Singular/ipshell.cc
+@@ -11,7 +11,7 @@
+ #include <ctype.h>
+ #include <math.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <kernel/options.h>
+ #include <Singular/ipid.h>
+diff --git a/Singular/janet.cc b/Singular/janet.cc
+index d381a46..a0d24ba 100755
+--- a/Singular/janet.cc
++++ b/Singular/janet.cc
+@@ -3,7 +3,7 @@
+ #include <string.h>
+ #include <time.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/polys.h>
+ #include <kernel/numbers.h>
+diff --git a/Singular/libparse.l b/Singular/libparse.l
+index c69af26..c85079b 100644
+--- a/Singular/libparse.l
++++ b/Singular/libparse.l
+@@ -7,7 +7,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <ctype.h>
+-#include <kernel/mod2.h>
++#include "mod2.h"
+ #ifdef STANDALONE_PARSER
+ #include <Singular/utils.h>
+ #define HAVE_LIBPARSER
+diff --git a/Singular/lists.cc b/Singular/lists.cc
+index d66f29d..d043fca 100644
+--- a/Singular/lists.cc
++++ b/Singular/lists.cc
+@@ -8,7 +8,7 @@
+ // to produce a non-inline version from lists.h
+ #define LISTS_CC
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <kernel/febase.h>
+ //#include "ipid.h"
+diff --git a/Singular/maps_ip.cc b/Singular/maps_ip.cc
+index c74e8fd..cf34eaa 100644
+--- a/Singular/maps_ip.cc
++++ b/Singular/maps_ip.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT - the mapping of polynomials to other rings
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <kernel/febase.h>
+ #include <kernel/polys.h>
+diff --git a/Singular/minpoly.cc b/Singular/minpoly.cc
+index c081a54..8538700 100644
+--- a/Singular/minpoly.cc
++++ b/Singular/minpoly.cc
+@@ -5,7 +5,7 @@
+
+
+ #include<cmath>
+-#include<Singular/mod2.h>
++#include <Singular/mod2.h>
+ //#include<iomanip>
+
+ #include "minpoly.h"
+diff --git a/Singular/misc_ip.cc b/Singular/misc_ip.cc
+index 43c1629..99de664 100644
+--- a/Singular/misc_ip.cc
++++ b/Singular/misc_ip.cc
+@@ -14,7 +14,7 @@
+ /*****************************************************************************/
+
+ // include header files
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/lists.h>
+ #include <kernel/longrat.h>
+ #include <Singular/misc_ip.h>
+diff --git a/Singular/mpsr_Error.cc b/Singular/mpsr_Error.cc
+index be4b923..0d1142f 100644
+--- a/Singular/mpsr_Error.cc
++++ b/Singular/mpsr_Error.cc
+@@ -12,7 +12,7 @@
+ * Change History (most recent first):
+ *
+ ***************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/mpsr_Get.cc b/Singular/mpsr_Get.cc
+index 6708165..e305e34 100644
+--- a/Singular/mpsr_Get.cc
++++ b/Singular/mpsr_Get.cc
+@@ -13,7 +13,7 @@
+ *
+ ***************************************************************/
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/mpsr_GetMisc.cc b/Singular/mpsr_GetMisc.cc
+index fda7ac3..457b01e 100644
+--- a/Singular/mpsr_GetMisc.cc
++++ b/Singular/mpsr_GetMisc.cc
+@@ -13,7 +13,7 @@
+ *
+ ***************************************************************/
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/mpsr_GetPoly.cc b/Singular/mpsr_GetPoly.cc
+index de57603..4d885ee 100644
+--- a/Singular/mpsr_GetPoly.cc
++++ b/Singular/mpsr_GetPoly.cc
+@@ -12,7 +12,7 @@
+ *
+ *
+ ***************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_MPSR
+ #include "mylimits.h"
+diff --git a/Singular/mpsr_Put.cc b/Singular/mpsr_Put.cc
+index ca868a5..46c336f 100644
+--- a/Singular/mpsr_Put.cc
++++ b/Singular/mpsr_Put.cc
+@@ -14,7 +14,7 @@
+ * Updated putting routines to MP and MPP v1.1
+ *
+ ***************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/mpsr_PutPoly.cc b/Singular/mpsr_PutPoly.cc
+index 51c67de..7c19889 100644
+--- a/Singular/mpsr_PutPoly.cc
++++ b/Singular/mpsr_PutPoly.cc
+@@ -15,7 +15,7 @@
+ * Updated routines to MP and MPP v1.1
+ *
+ ***************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/mpsr_Tok.cc b/Singular/mpsr_Tok.cc
+index 8d8873c..a006d79 100644
+--- a/Singular/mpsr_Tok.cc
++++ b/Singular/mpsr_Tok.cc
+@@ -18,7 +18,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/mpsr_sl.cc b/Singular/mpsr_sl.cc
+index 39224f3..84f0db2 100644
+--- a/Singular/mpsr_sl.cc
++++ b/Singular/mpsr_sl.cc
+@@ -9,7 +9,7 @@
+ * Version: $Id: mpsr_sl.cc 13937 2011-03-07 16:10:06Z hannes $
+ *******************************************************************/
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/ndbm.cc b/Singular/ndbm.cc
+index c6f4e11..f67fe34 100644
+--- a/Singular/ndbm.cc
++++ b/Singular/ndbm.cc
+@@ -14,7 +14,7 @@
+ //
+ //**************************************************************************/
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #ifdef HAVE_DBM
+ #ifndef HPUX_9
+ #include <strings.h>
+diff --git a/Singular/pcv.cc b/Singular/pcv.cc
+index de543be..d463a09 100644
+--- a/Singular/pcv.cc
++++ b/Singular/pcv.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: conversion between polys and coef vectors
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_PCV
+ //#if !defined(HAVE_DYNAMIC_LOADING) || defined(BUILD_MODULE)
+diff --git a/Singular/pipeLink.cc b/Singular/pipeLink.cc
+index 755efd6..25bb557 100644
+--- a/Singular/pipeLink.cc
++++ b/Singular/pipeLink.cc
+@@ -17,7 +17,7 @@
+ #include <sys/socket.h>
+
+
+-#include "mod2.h"
++#include <Singular/mod2.h>
+
+ #include "tok.h"
+ #include "ipid.h"
+diff --git a/Singular/scanner.cc b/Singular/scanner.cc
+index bbe8eea..16cbbfc 100644
+--- a/Singular/scanner.cc
++++ b/Singular/scanner.cc
+@@ -561,7 +561,7 @@ char *yytext;
+ #include <stdlib.h>
+ #include <ctype.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+ #include <Singular/tok.h>
+ #include <Singular/stype.h>
+diff --git a/Singular/scanner.l b/Singular/scanner.l
+index 384072b..aad2f7f 100644
+--- a/Singular/scanner.l
++++ b/Singular/scanner.l
+@@ -8,7 +8,7 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+ #include <omalloc/omalloc.h>
+ #include <Singular/tok.h>
+ #include <Singular/stype.h>
+diff --git a/Singular/sdb.cc b/Singular/sdb.cc
+index 7460449..300bea0 100644
+--- a/Singular/sdb.cc
++++ b/Singular/sdb.cc
+@@ -8,7 +8,7 @@
+
+ #include <unistd.h> // for unlink,fork,execlp,getpid
+ #include <sys/wait.h> // for wait
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+diff --git a/Singular/silink.cc b/Singular/silink.cc
+index 90c11da..a96b7e3 100644
+--- a/Singular/silink.cc
++++ b/Singular/silink.cc
+@@ -13,7 +13,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+diff --git a/Singular/sing_dbm.cc b/Singular/sing_dbm.cc
+index cb84bb2..2fb06c7 100644
+--- a/Singular/sing_dbm.cc
++++ b/Singular/sing_dbm.cc
+@@ -16,7 +16,7 @@
+ # include <fcntl.h>
+ # include <errno.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_DBM
+
+diff --git a/Singular/sing_win.cc b/Singular/sing_win.cc
+index b2fc5ea..a961016 100644
+--- a/Singular/sing_win.cc
++++ b/Singular/sing_win.cc
+@@ -7,7 +7,7 @@
+ * ABSTRACT: Windows specific routines
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #ifdef ix86_Win
+ #include <windows.h>
+ #include <winuser.h>
+diff --git a/Singular/slInit_Dynamic.cc b/Singular/slInit_Dynamic.cc
+index f93653e..8c179ee 100644
+--- a/Singular/slInit_Dynamic.cc
++++ b/Singular/slInit_Dynamic.cc
+@@ -14,7 +14,7 @@
+ * MP link Extension inits
+ *
+ ***************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/silink.h>
+ #include <Singular/slInit.h>
+ #include <kernel/mod_raw.h>
+diff --git a/Singular/slInit_Static.cc b/Singular/slInit_Static.cc
+index ffe3eed..fef9eac 100644
+--- a/Singular/slInit_Static.cc
++++ b/Singular/slInit_Static.cc
+@@ -14,7 +14,7 @@
+ * MP link Extension inits
+ *
+ ***************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/silink.h>
+ #include <Singular/slInit.h>
+
+diff --git a/Singular/ssiLink.cc b/Singular/ssiLink.cc
+index 0705a7d..f216dc8 100644
+--- a/Singular/ssiLink.cc
++++ b/Singular/ssiLink.cc
+@@ -22,7 +22,7 @@
+
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ // #include "mod2.h"
+
+ #include <Singular/tok.h>
+diff --git a/Singular/subexpr.cc b/Singular/subexpr.cc
+index bba1b6d..1f63592 100644
+--- a/Singular/subexpr.cc
++++ b/Singular/subexpr.cc
+@@ -11,7 +11,7 @@
+ #include <ctype.h>
+ #include <unistd.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/intvec.h>
+ #include <Singular/tok.h>
+ #include <kernel/options.h>
+diff --git a/Singular/tesths.cc b/Singular/tesths.cc
+index 475d942..10e9cc0 100644
+--- a/Singular/tesths.cc
++++ b/Singular/tesths.cc
+@@ -14,7 +14,7 @@
+ #include <stdlib.h>
+ #include <time.h>
+ #include <errno.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <kernel/options.h>
+ #include <Singular/ipshell.h>
+diff --git a/Singular/walk.cc b/Singular/walk.cc
+index 34ba272..f4bc159 100644
+--- a/Singular/walk.cc
++++ b/Singular/walk.cc
+@@ -46,7 +46,7 @@
+ #include <sys/types.h>
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/intvec.h>
+ #include <Singular/cntrlc.h>
+ #include <kernel/options.h>
+diff --git a/Singular/walk_ip.cc b/Singular/walk_ip.cc
+index a315433..01a58a4 100644
+--- a/Singular/walk_ip.cc
++++ b/Singular/walk_ip.cc
+@@ -12,7 +12,7 @@
+ #include <ctype.h>
+ #include <math.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <kernel/options.h>
+ #include <Singular/ipid.h>
+diff --git a/Singular/wrapper.cc b/Singular/wrapper.cc
+index 07a2e2f..7884e9f 100755
+--- a/Singular/wrapper.cc
++++ b/Singular/wrapper.cc
+@@ -1,5 +1,5 @@
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/febase.h>
+ #include <kernel/polys.h>
+ #include <kernel/kstd1.h>
+diff --git a/kernel/F4.cc b/kernel/F4.cc
+index 3e56e0b..22c7699 100644
+--- a/kernel/F4.cc
++++ b/kernel/F4.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/F4.h>
+ #include <kernel/tgb_internal.h>
+ #include <kernel/tgbgauss.h>
+diff --git a/kernel/F5cData.cc b/kernel/F5cData.cc
+index be2021a..384ebc9 100644
+--- a/kernel/F5cData.cc
++++ b/kernel/F5cData.cc
+@@ -9,7 +9,7 @@
+ * these data types is defined.
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_F5C
+ #include <kernel/kutil.h>
+diff --git a/kernel/F5cLists.cc b/kernel/F5cLists.cc
+index daab9db..8922036 100644
+--- a/kernel/F5cLists.cc
++++ b/kernel/F5cLists.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_F5C
+ #include <kernel/kutil.h>
+diff --git a/kernel/GMPrat.cc b/kernel/GMPrat.cc
+index 8d73221..628d90d 100644
+--- a/kernel/GMPrat.cc
++++ b/kernel/GMPrat.cc
+@@ -8,7 +8,7 @@
+
+ #define GMPRAT_CC
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_SPECTRUM
+
+diff --git a/kernel/Number.h b/kernel/Number.h
+index 4428d15..05f52b7 100644
+--- a/kernel/Number.h
++++ b/kernel/Number.h
+@@ -1,7 +1,7 @@
+ #ifndef NUMBERCPP_HEADER
+ #define NUMBERCPP_HEADER
+ #include <boost/intrusive_ptr.hpp>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/numbers.h>
+ #include <kernel/febase.h>
+ #include <kernel/ring.h>
+diff --git a/kernel/Poly.h b/kernel/Poly.h
+index 481e96a..d95614b 100644
+--- a/kernel/Poly.h
++++ b/kernel/Poly.h
+@@ -4,7 +4,7 @@
+
+ #ifndef POLYCPP_HEADER
+ #define POLYCPP_HEADER
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/IIntvec.h>
+ #include <kernel/numbers.h>
+ #include <kernel/Number.h>
+diff --git a/kernel/PowerSeries.h b/kernel/PowerSeries.h
+index 809d0b5..7c3f764 100644
+--- a/kernel/PowerSeries.h
++++ b/kernel/PowerSeries.h
+@@ -1,6 +1,6 @@
+ #ifndef POWER_SERIES_HEADER
+ #define POWER_SERIES_HEADER
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/Poly.h>
+ template <class traits> class PowerSeriesInputIterator:
+ public std::
+diff --git a/kernel/clapconv.cc b/kernel/clapconv.cc
+index a043330..3cf1386 100644
+--- a/kernel/clapconv.cc
++++ b/kernel/clapconv.cc
+@@ -8,7 +8,7 @@
+ */
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #ifdef HAVE_FACTORY
+ #include <omalloc/omalloc.h>
+ #include <kernel/structs.h>
+diff --git a/kernel/clapsing.cc b/kernel/clapsing.cc
+index 2159b6a..e822a0a 100644
+--- a/kernel/clapsing.cc
++++ b/kernel/clapsing.cc
+@@ -8,7 +8,7 @@
+ */
+
+ //#define FACTORIZE2_DEBUG
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+ #ifdef HAVE_FACTORY
+ #define SI_DONT_HAVE_GLOBAL_VARS
+diff --git a/kernel/dError.c b/kernel/dError.c
+index 61a5076..18c9ec4 100644
+--- a/kernel/dError.c
++++ b/kernel/dError.c
+@@ -12,7 +12,7 @@
+ #define DERROR_C
+ #include <stdarg.h>
+ #include <stdio.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/distrib.h>
+ #ifdef HAVE_CONFIG_H
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/digitech.cc b/kernel/digitech.cc
+index 89f6a44..a03ccdf 100644
+--- a/kernel/digitech.cc
++++ b/kernel/digitech.cc
+@@ -2,7 +2,7 @@
+ * Computer Algebra System SINGULAR *
+ ****************************************/
+ /* $Id: digitech.cc 13628 2010-11-10 16:07:34Z hannes $ */
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/ring.h>
+
+ #include <kernel/digitech.h>
+diff --git a/kernel/digitech.h b/kernel/digitech.h
+index b8d0fd3..a1ceb37 100644
+--- a/kernel/digitech.h
++++ b/kernel/digitech.h
+@@ -1,6 +1,6 @@
+ #ifndef DIGITECH_HEADER
+ #define DIGITECH_HEADER
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/polys.h>
+ void bit_reduce(poly & f,ring r);
+ poly uni_subst_bits(poly outer_uni, poly inner_multi, ring r);
+diff --git a/kernel/eigenval.cc b/kernel/eigenval.cc
+index c2dad58..2c4d628 100644
+--- a/kernel/eigenval.cc
++++ b/kernel/eigenval.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: eigenvalues of constant square matrices
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_EIGENVAL
+
+diff --git a/kernel/f5c.cc b/kernel/f5c.cc
+index c1e3b33..caebac9 100644
+--- a/kernel/f5c.cc
++++ b/kernel/f5c.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #ifdef HAVE_F5C
+ #include <unistd.h>
+ #include <kernel/structs.h>
+diff --git a/kernel/f5data.cc b/kernel/f5data.cc
+index d5c716a..7033b45 100644
+--- a/kernel/f5data.cc
++++ b/kernel/f5data.cc
+@@ -6,7 +6,7 @@
+ /*
+ * ABSTRACT: lpolynomial definition
+ */
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_F5
+ #include <kernel/kutil.h>
+diff --git a/kernel/f5gb.cc b/kernel/f5gb.cc
+index d308517..72b20d0 100644
+--- a/kernel/f5gb.cc
++++ b/kernel/f5gb.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT: f5gb interface
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #ifdef HAVE_F5
+ #include <unistd.h>
+ #include <omp.h>
+diff --git a/kernel/f5lists.cc b/kernel/f5lists.cc
+index ae0bcab..4546a17 100644
+--- a/kernel/f5lists.cc
++++ b/kernel/f5lists.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_F5
+ #include <kernel/kutil.h>
+diff --git a/kernel/fast_maps.cc b/kernel/fast_maps.cc
+index 4866aed..205abb3 100644
+--- a/kernel/fast_maps.cc
++++ b/kernel/fast_maps.cc
+@@ -8,7 +8,7 @@
+ * Created: 02/01
+ * Version: $Id: fast_maps.cc 13210 2010-09-17 13:36:19Z seelisch $
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/options.h>
+ #include <kernel/p_polys.h>
+diff --git a/kernel/fast_mult.cc b/kernel/fast_mult.cc
+index 95b40c4..39f12c4 100644
+--- a/kernel/fast_mult.cc
++++ b/kernel/fast_mult.cc
+@@ -2,7 +2,7 @@
+ * Computer Algebra System SINGULAR *
+ ****************************************/
+ /* $Id: fast_mult.cc 14278 2011-06-14 13:49:47Z hannes $ */
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/ring.h>
+ #include <kernel/fast_mult.h>
+ #include <kernel/kbuckets.h>
+diff --git a/kernel/fast_mult.h b/kernel/fast_mult.h
+index 43a4344..41e97e4 100644
+--- a/kernel/fast_mult.h
++++ b/kernel/fast_mult.h
+@@ -1,6 +1,6 @@
+ #ifndef fast_mult_header
+ #define fast_mult_header
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/polys.h>
+ poly unifastmult(poly f,poly g, ring r);
+ poly multifastmult(poly f, poly g, ring r);
+diff --git a/kernel/feResource.cc b/kernel/feResource.cc
+index ba0385c..5bb750f 100644
+--- a/kernel/feResource.cc
++++ b/kernel/feResource.cc
+@@ -10,7 +10,7 @@
+ #include <unistd.h>
+ #include <string.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #ifdef AIX_4
+ #define HAVE_PUTENV 1
+ #endif
+diff --git a/kernel/febase.cc b/kernel/febase.cc
+index b8a7789..6d1bbd4 100644
+--- a/kernel/febase.cc
++++ b/kernel/febase.cc
+@@ -8,7 +8,7 @@
+
+ /* I need myfread in standalone_parser */
+ #ifndef STANDALONE_PARSER
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #include <stdlib.h>
+ #include <stdio.h>
+diff --git a/kernel/fegetopt.c b/kernel/fegetopt.c
+index 6bac789..bf312ee 100644
+--- a/kernel/fegetopt.c
++++ b/kernel/fegetopt.c
+@@ -32,7 +32,7 @@
+ */
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifndef __STDC__
+ # ifndef const
+diff --git a/kernel/feread.cc b/kernel/feread.cc
+index a77285b..f3e7f12 100644
+--- a/kernel/feread.cc
++++ b/kernel/feread.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: input from ttys, simulating fgets
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ // ----------------------------------------
+ // system settings:
+diff --git a/kernel/fereadl.c b/kernel/fereadl.c
+index 9f3407b..21873b8 100644
+--- a/kernel/fereadl.c
++++ b/kernel/fereadl.c
+@@ -7,7 +7,7 @@
+ */
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/febase.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/structs.h>
+diff --git a/kernel/ffields.cc b/kernel/ffields.cc
+index 91ed4e3..c1143c8 100644
+--- a/kernel/ffields.cc
++++ b/kernel/ffields.cc
+@@ -7,7 +7,7 @@
+ */
+
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <kernel/febase.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/fglmcomb.cc b/kernel/fglmcomb.cc
+index 3d3eaa1..d19eead 100644
+--- a/kernel/fglmcomb.cc
++++ b/kernel/fglmcomb.cc
+@@ -8,7 +8,7 @@
+ * ABSTRACT -
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_FACTORY
+ #include <kernel/options.h>
+diff --git a/kernel/fglmgauss.cc b/kernel/fglmgauss.cc
+index 5764597..d3b3ee4 100644
+--- a/kernel/fglmgauss.cc
++++ b/kernel/fglmgauss.cc
+@@ -9,7 +9,7 @@
+ * to find linear dependecies of fglmVectors.
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_FACTORY
+ #include <kernel/structs.h>
+diff --git a/kernel/fglmhom.cc b/kernel/fglmhom.cc
+index 468dc2c..61219da 100644
+--- a/kernel/fglmhom.cc
++++ b/kernel/fglmhom.cc
+@@ -10,7 +10,7 @@
+ */
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #if 0
+ #include <factoryconf.h>
+ #ifndef NOSTREAMIO
+diff --git a/kernel/fglmvec.cc b/kernel/fglmvec.cc
+index b9f90da..c2d8579 100644
+--- a/kernel/fglmvec.cc
++++ b/kernel/fglmvec.cc
+@@ -12,7 +12,7 @@
+ * specialized for this purpose.
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_FACTORY
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/fglmzero.cc b/kernel/fglmzero.cc
+index e9d3dae..b3bd181 100644
+--- a/kernel/fglmzero.cc
++++ b/kernel/fglmzero.cc
+@@ -18,7 +18,7 @@
+ * o FindUnivariatePolys added
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_FACTORY
+ #include <kernel/options.h>
+diff --git a/kernel/gfan.cc b/kernel/gfan.cc
+index ca08a3c..55c9431 100644
+--- a/kernel/gfan.cc
++++ b/kernel/gfan.cc
+@@ -6,7 +6,7 @@ $Header: /usr/local/Singular/cvsroot/kernel/gfan.cc,v 1.103 2009/11/03 06:57:32
+ $Id: gfan.cc 14493 2012-01-16 11:00:07Z motsak $
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_FANS
+ #include <kernel/options.h>
+diff --git a/kernel/gnumpc.cc b/kernel/gnumpc.cc
+index da6d51c..e20b0ab 100644
+--- a/kernel/gnumpc.cc
++++ b/kernel/gnumpc.cc
+@@ -8,7 +8,7 @@
+ * ngc == number gnu complex
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/gnumpfl.cc b/kernel/gnumpfl.cc
+index 4d49b11..c3d7c5c 100644
+--- a/kernel/gnumpfl.cc
++++ b/kernel/gnumpfl.cc
+@@ -8,7 +8,7 @@
+ * ngf == number gnu floats
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/gr_kstd2.cc b/kernel/gr_kstd2.cc
+index dc014e8..1fe8521 100644
+--- a/kernel/gr_kstd2.cc
++++ b/kernel/gr_kstd2.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT - Kernel: noncomm. alg. of Buchberger
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_PLURAL
+
+diff --git a/kernel/gring.cc b/kernel/gring.cc
+index 5abd2cb..1feb027 100644
+--- a/kernel/gring.cc
++++ b/kernel/gring.cc
+@@ -17,7 +17,7 @@
+ #define OM_TRACK 5
+ #endif
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_PLURAL
+ #define PLURAL_INTERNAL_DECLARATIONS
+diff --git a/kernel/hdegree.cc b/kernel/hdegree.cc
+index 4706f5b..df561e6 100644
+--- a/kernel/hdegree.cc
++++ b/kernel/hdegree.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT - dimension, multiplicity, HC, kbase
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+
+ #include <kernel/structs.h>
+diff --git a/kernel/hilb.cc b/kernel/hilb.cc
+index 64abe8a..e38b0f4 100644
+--- a/kernel/hilb.cc
++++ b/kernel/hilb.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT - Hilbert series
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/hutil.cc b/kernel/hutil.cc
+index 4e76eb7..62788b1 100644
+--- a/kernel/hutil.cc
++++ b/kernel/hutil.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: Utilities for staircase operations
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/ideals.cc b/kernel/ideals.cc
+index 8d8f8f6..d68e749 100644
+--- a/kernel/ideals.cc
++++ b/kernel/ideals.cc
+@@ -7,7 +7,7 @@
+ */
+
+ /* includes */
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifndef NDEBUG
+ # define MYTEST 0
+diff --git a/kernel/int64vec.cc b/kernel/int64vec.cc
+index 4937c7a..2b76231 100644
+--- a/kernel/int64vec.cc
++++ b/kernel/int64vec.cc
+@@ -5,7 +5,7 @@
+ /*
+ * ABSTRACT: class int64vec: lists/vectors of int64
+ */
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+ #include <kernel/int64vec.h>
+diff --git a/kernel/intvec.cc b/kernel/intvec.cc
+index 95b1fa4..a734f88 100644
+--- a/kernel/intvec.cc
++++ b/kernel/intvec.cc
+@@ -7,7 +7,7 @@
+ */
+ #ifndef INTVEC_CC
+ #define INTVEC_CC
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/febase.h>
+ #include <kernel/options.h>
+ #include <kernel/intvec.h>
+diff --git a/kernel/kbuckets.cc b/kernel/kbuckets.cc
+index 0c6f388..0826e8e 100644
+--- a/kernel/kbuckets.cc
++++ b/kernel/kbuckets.cc
+@@ -3,7 +3,7 @@
+ ****************************************/
+ /* $Id: kbuckets.cc 14278 2011-06-14 13:49:47Z hannes $ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/p_polys.h>
+diff --git a/kernel/khstd.cc b/kernel/khstd.cc
+index 421afdc..1a2aa5f 100644
+--- a/kernel/khstd.cc
++++ b/kernel/khstd.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT:utils for hilbert driven kStd
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/febase.h>
+ #include <kernel/options.h>
+ #include <kernel/polys.h>
+diff --git a/kernel/kspoly.cc b/kernel/kspoly.cc
+index 6288e4a..0cbe7d5 100644
+--- a/kernel/kspoly.cc
++++ b/kernel/kspoly.cc
+@@ -7,7 +7,7 @@
+ */
+
+ // #define PDEBUG 2
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <kernel/kutil.h>
+ #include <kernel/numbers.h>
+diff --git a/kernel/kstd1.cc b/kernel/kstd1.cc
+index 1c10f05..690a9f9 100644
+--- a/kernel/kstd1.cc
++++ b/kernel/kstd1.cc
+@@ -14,7 +14,7 @@
+ // define if buckets should be used
+ #define MORA_USE_BUCKETS
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+
+ #ifndef NDEBUG
+diff --git a/kernel/kstd2.cc b/kernel/kstd2.cc
+index 663fc1d..b064a59 100644
+--- a/kernel/kstd2.cc
++++ b/kernel/kstd2.cc
+@@ -13,7 +13,7 @@
+ // define to enable tailRings
+ #define HAVE_TAIL_RING
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifndef NDEBUG
+ # define MYTEST 0
+diff --git a/kernel/kstdfac.cc b/kernel/kstdfac.cc
+index 6d598e3..10c4800 100644
+--- a/kernel/kstdfac.cc
++++ b/kernel/kstdfac.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT - Kernel: factorizing alg. of Buchberger
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/options.h>
+ #include <kernel/polys.h>
+diff --git a/kernel/kutil.cc b/kernel/kutil.cc
+index 2b10ea5..a464baf 100644
+--- a/kernel/kutil.cc
++++ b/kernel/kutil.cc
+@@ -10,7 +10,7 @@
+ #define KUTIL_CC
+ #include <stdlib.h>
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifndef NDEBUG
+ # define MYTEST 0
+diff --git a/kernel/linearAlgebra.cc b/kernel/linearAlgebra.cc
+index a06d10e..e3f22a7 100644
+--- a/kernel/linearAlgebra.cc
++++ b/kernel/linearAlgebra.cc
+@@ -16,7 +16,7 @@
+ /*****************************************************************************/
+
+ // include header files
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/polys.h>
+ #include <kernel/ideals.h>
+diff --git a/kernel/longalg.cc b/kernel/longalg.cc
+index 730d8a1..2e179b7 100644
+--- a/kernel/longalg.cc
++++ b/kernel/longalg.cc
+@@ -7,7 +7,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/febase.h>
+diff --git a/kernel/longrat.cc b/kernel/longrat.cc
+index bf7614e..4370f46 100644
+--- a/kernel/longrat.cc
++++ b/kernel/longrat.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: computation with long rational numbers (Hubert Grassmann)
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/longrat.h>
+
+diff --git a/kernel/longrat0.cc b/kernel/longrat0.cc
+index a550a2e..ee9b596 100644
+--- a/kernel/longrat0.cc
++++ b/kernel/longrat0.cc
+@@ -9,7 +9,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/febase.h>
+diff --git a/kernel/longtrans.cc b/kernel/longtrans.cc
+index cf2ebef..88d48ab 100644
+--- a/kernel/longtrans.cc
++++ b/kernel/longtrans.cc
+@@ -9,7 +9,7 @@
+ #if 0
+ #include <stdio.h>
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/febase.h>
+diff --git a/kernel/lplist.cc b/kernel/lplist.cc
+index cd41992..12151e9 100644
+--- a/kernel/lplist.cc
++++ b/kernel/lplist.cc
+@@ -5,7 +5,7 @@
+ /*
+ * ABSTRACT: list interface
+ */
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_F5
+
+diff --git a/kernel/maps.cc b/kernel/maps.cc
+index c1b5023..fa6cc80 100644
+--- a/kernel/maps.cc
++++ b/kernel/maps.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT - the mapping of polynomials to other rings
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <kernel/febase.h>
+ #include <kernel/polys.h>
+diff --git a/kernel/matpol.cc b/kernel/matpol.cc
+index 5e5147f..0d9c215 100644
+--- a/kernel/matpol.cc
++++ b/kernel/matpol.cc
+@@ -10,7 +10,7 @@
+ #include <stdio.h>
+ #include <math.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <kernel/structs.h>
+ #include <kernel/kstd1.h>
+diff --git a/kernel/misc.cc b/kernel/misc.cc
+index 4ba410c..21ecce5 100644
+--- a/kernel/misc.cc
++++ b/kernel/misc.cc
+@@ -12,7 +12,7 @@
+ #include <stdlib.h>
+ #include <time.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/structs.h>
+diff --git a/kernel/mmalloc.cc b/kernel/mmalloc.cc
+index 238d10d..6659b24 100644
+--- a/kernel/mmalloc.cc
++++ b/kernel/mmalloc.cc
+@@ -7,7 +7,7 @@
+ */
+ #include <stdlib.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #include <omalloc/omalloc.h>
+ #include <new>
+diff --git a/kernel/mmstd.c b/kernel/mmstd.c
+index e3f144a..80aeb53 100644
+--- a/kernel/mmstd.c
++++ b/kernel/mmstd.c
+@@ -7,7 +7,7 @@
+ * i.e. (malloc/realloc/free)
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #include <omalloc/omalloc.h>
+ #include <Singular/static.h>
+diff --git a/kernel/mod_raw.cc b/kernel/mod_raw.cc
+index e388b82..4971140 100644
+--- a/kernel/mod_raw.cc
++++ b/kernel/mod_raw.cc
+@@ -17,7 +17,7 @@
+ #include <sys/stat.h>
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/static.h>
+
+ #include <kernel/mod_raw.h>
+diff --git a/kernel/modulop.cc b/kernel/modulop.cc
+index 8b9089f..126d712 100644
+--- a/kernel/modulop.cc
++++ b/kernel/modulop.cc
+@@ -6,7 +6,7 @@
+ */
+
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+diff --git a/kernel/mpr_base.cc b/kernel/mpr_base.cc
+index e67757c..f1a50b9 100644
+--- a/kernel/mpr_base.cc
++++ b/kernel/mpr_base.cc
+@@ -8,7 +8,7 @@
+
+ #include <math.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #include <omalloc/mylimits.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/mpr_complex.cc b/kernel/mpr_complex.cc
+index bea595f..b5427f9 100644
+--- a/kernel/mpr_complex.cc
++++ b/kernel/mpr_complex.cc
+@@ -11,7 +11,7 @@
+
+ // WARNING! ALWAYS use omAlloc and FreeL when alloc. memory for some char* !!
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ //#ifdef HAVE_MPR
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+diff --git a/kernel/mpr_inout.cc b/kernel/mpr_inout.cc
+index 6957432..3499fe4 100644
+--- a/kernel/mpr_inout.cc
++++ b/kernel/mpr_inout.cc
+@@ -8,7 +8,7 @@
+ * ABSTRACT - multipolynomial resultant
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ //#ifdef HAVE_MPR
+
+ //-> includes
+diff --git a/kernel/mpr_numeric.cc b/kernel/mpr_numeric.cc
+index bf2e87a..10e7bd9 100644
+--- a/kernel/mpr_numeric.cc
++++ b/kernel/mpr_numeric.cc
+@@ -9,7 +9,7 @@
+ * ( root finder, vandermonde system solver, simplex )
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ //#ifdef HAVE_MPR
+
+ //#define mprDEBUG_ALL
+diff --git a/kernel/multicnt.cc b/kernel/multicnt.cc
+index 9f11b1d..de21ed3 100644
+--- a/kernel/multicnt.cc
++++ b/kernel/multicnt.cc
+@@ -7,7 +7,7 @@
+
+ #define MULTICNT_CC
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_SPECTRUM
+
+diff --git a/kernel/ncSACache.cc b/kernel/ncSACache.cc
+index 99eaeb5..c8a23d2 100644
+--- a/kernel/ncSACache.cc
++++ b/kernel/ncSACache.cc
+@@ -18,7 +18,7 @@
+ #endif
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifndef NDEBUG
+ #define OUTPUT 1
+diff --git a/kernel/ncSAFormula.cc b/kernel/ncSAFormula.cc
+index b5c6cef..f26ddc3 100644
+--- a/kernel/ncSAFormula.cc
++++ b/kernel/ncSAFormula.cc
+@@ -18,7 +18,7 @@
+ #endif
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_PLURAL
+
+diff --git a/kernel/ncSAMult.cc b/kernel/ncSAMult.cc
+index d562476..80ae708 100644
+--- a/kernel/ncSAMult.cc
++++ b/kernel/ncSAMult.cc
+@@ -18,7 +18,7 @@
+ #endif
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_PLURAL
+
+diff --git a/kernel/npolygon.cc b/kernel/npolygon.cc
+index afb939b..b54d941 100644
+--- a/kernel/npolygon.cc
++++ b/kernel/npolygon.cc
+@@ -7,7 +7,7 @@
+
+ #define NPOLYGON_CC
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_SPECTRUM
+
+diff --git a/kernel/numbers.cc b/kernel/numbers.cc
+index 73714de..fe59242 100644
+--- a/kernel/numbers.cc
++++ b/kernel/numbers.cc
+@@ -9,7 +9,7 @@
+
+ #include <string.h>
+ #include <stdlib.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+ #include <kernel/kstd1.h>
+diff --git a/kernel/pDebug.cc b/kernel/pDebug.cc
+index 6ce992f..68bdfb1 100644
+--- a/kernel/pDebug.cc
++++ b/kernel/pDebug.cc
+@@ -15,7 +15,7 @@
+ #include <stdio.h>
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #ifdef PDEBUG
+
+ // do the following to always enforce checking of pSetm
+diff --git a/kernel/pInline0.cc b/kernel/pInline0.cc
+index 4160627..73a9de7 100644
+--- a/kernel/pInline0.cc
++++ b/kernel/pInline0.cc
+@@ -10,7 +10,7 @@
+ *******************************************************************/
+ #ifndef PINLINE0_CC
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #define PINLINE0_CC
+ #undef DO_PINLINE0
+diff --git a/kernel/pInline1.cc b/kernel/pInline1.cc
+index 68bf114..a1ad691 100644
+--- a/kernel/pInline1.cc
++++ b/kernel/pInline1.cc
+@@ -11,7 +11,7 @@
+ #ifndef PINLINE1_CC
+ #define PINLINE1_CC
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef PDEBUG
+
+diff --git a/kernel/pInline2.cc b/kernel/pInline2.cc
+index 5aafa5b..c8229b4 100644
+--- a/kernel/pInline2.cc
++++ b/kernel/pInline2.cc
+@@ -10,7 +10,7 @@
+ *******************************************************************/
+ #ifndef PINLINE2_CC
+ #define PINLINE2_CC
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef PDEBUG
+
+diff --git a/kernel/pShallowCopyDelete.cc b/kernel/pShallowCopyDelete.cc
+index 3aef21c..aa32ca7 100644
+--- a/kernel/pShallowCopyDelete.cc
++++ b/kernel/pShallowCopyDelete.cc
+@@ -8,7 +8,7 @@
+ * Created: 8/00
+ * Version: $Id: pShallowCopyDelete.cc 13032 2010-07-17 20:38:50Z krueger $
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/p_polys.h>
+ #include <kernel/ring.h>
+ #include <kernel/pShallowCopyDelete.h>
+diff --git a/kernel/p_Mult_q.cc b/kernel/p_Mult_q.cc
+index a638570..35f2349 100644
+--- a/kernel/p_Mult_q.cc
++++ b/kernel/p_Mult_q.cc
+@@ -8,7 +8,7 @@
+ * Created: 8/00
+ * Version: $Id: p_Mult_q.cc 13032 2010-07-17 20:38:50Z krueger $
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ /***************************************************************
+ *
+diff --git a/kernel/p_Mult_q.h b/kernel/p_Mult_q.h
+index 9000e51..87f57ee 100644
+--- a/kernel/p_Mult_q.h
++++ b/kernel/p_Mult_q.h
+@@ -9,7 +9,7 @@
+ * Created: 8/00
+ * Version: $Id: p_Mult_q.h 13032 2010-07-17 20:38:50Z krueger $
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+
+ // Use buckets if min(pLength(p), pLength(q)) >= MIN_LENGTH_BUCKET
+diff --git a/kernel/p_Procs_Dynamic.cc b/kernel/p_Procs_Dynamic.cc
+index 9e8bd31..800c3d4 100644
+--- a/kernel/p_Procs_Dynamic.cc
++++ b/kernel/p_Procs_Dynamic.cc
+@@ -8,7 +8,7 @@
+ * Created: 12/00
+ * Version: $Id: p_Procs_Dynamic.cc 13051 2010-07-22 14:33:35Z hannes $
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/p_polys.h>
+ #include <kernel/ring.h>
+diff --git a/kernel/p_Procs_Generate.cc b/kernel/p_Procs_Generate.cc
+index 5733285..3b25bac 100644
+--- a/kernel/p_Procs_Generate.cc
++++ b/kernel/p_Procs_Generate.cc
+@@ -15,7 +15,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/dError.c>
+
+ #ifdef p_Procs_Static
+diff --git a/kernel/p_Procs_Lib.cc b/kernel/p_Procs_Lib.cc
+index 33a3b9f..28bcdfb 100644
+--- a/kernel/p_Procs_Lib.cc
++++ b/kernel/p_Procs_Lib.cc
+@@ -8,7 +8,7 @@
+ * Created: 12/00
+ * Version: $Id: p_Procs_Lib.cc 13052 2010-07-22 14:34:50Z hannes $
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/p_polys.h>
+ #include <kernel/ring.h>
+diff --git a/kernel/p_Procs_Static.cc b/kernel/p_Procs_Static.cc
+index c7b571a..ad11c01 100644
+--- a/kernel/p_Procs_Static.cc
++++ b/kernel/p_Procs_Static.cc
+@@ -8,7 +8,7 @@
+ * Created: 12/00
+ * Version: $Id: p_Procs_Static.cc 13051 2010-07-22 14:33:35Z hannes $
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/p_polys.h>
+ #include <kernel/ring.h>
+diff --git a/kernel/p_polys.cc b/kernel/p_polys.cc
+index 70c2bd2..32a84b3 100644
+--- a/kernel/p_polys.cc
++++ b/kernel/p_polys.cc
+@@ -10,7 +10,7 @@
+ *******************************************************************/
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #include <kernel/structs.h>
+ #include <kernel/p_polys.h>
+diff --git a/kernel/page.c b/kernel/page.c
+index 19681d5..4011a14 100644
+--- a/kernel/page.c
++++ b/kernel/page.c
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #ifdef PAGE_TEST
+ #include <stdlib.h>
+ #include <unistd.h>
+diff --git a/kernel/polys-impl.cc b/kernel/polys-impl.cc
+index 8afebcd..f0206f9 100644
+--- a/kernel/polys-impl.cc
++++ b/kernel/polys-impl.cc
+@@ -18,7 +18,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #include <omalloc/omalloc.h>
+ #ifdef PDEBUG
+diff --git a/kernel/polys.cc b/kernel/polys.cc
+index 65b0049..443994f 100644
+--- a/kernel/polys.cc
++++ b/kernel/polys.cc
+@@ -11,7 +11,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/febase.h>
+diff --git a/kernel/polys0.cc b/kernel/polys0.cc
+index 2047151..6d24da9 100644
+--- a/kernel/polys0.cc
++++ b/kernel/polys0.cc
+@@ -8,7 +8,7 @@
+ */
+
+ /* includes */
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/numbers.h>
+ #include <kernel/ring.h>
+diff --git a/kernel/polys1.cc b/kernel/polys1.cc
+index b7e6c35..382631d 100644
+--- a/kernel/polys1.cc
++++ b/kernel/polys1.cc
+@@ -10,7 +10,7 @@
+
+ /* includes */
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <kernel/numbers.h>
+ #include <kernel/ffields.h>
+diff --git a/kernel/prCopy.cc b/kernel/prCopy.cc
+index 1d7064d..9d26195 100644
+--- a/kernel/prCopy.cc
++++ b/kernel/prCopy.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT - implementation of functions for Copy/Move/Delete for Polys
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/p_polys.h>
+ #include <kernel/numbers.h>
+diff --git a/kernel/ratgring.cc b/kernel/ratgring.cc
+index bc8697b..c88937c 100644
+--- a/kernel/ratgring.cc
++++ b/kernel/ratgring.cc
+@@ -8,7 +8,7 @@
+ * Created: 8/00 - 11/00
+ * Version: $Id: ratgring.cc 13262 2010-09-23 15:01:24Z levandov $
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/ratgring.h>
+ #ifdef HAVE_RATGRING
+ #include <kernel/gring.h>
+diff --git a/kernel/ring.cc b/kernel/ring.cc
+index 418c3cb..477a73b 100644
+--- a/kernel/ring.cc
++++ b/kernel/ring.cc
+@@ -9,7 +9,7 @@
+
+ /* includes */
+ #include <math.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/ringgb.cc b/kernel/ringgb.cc
+index 9f3814b..2bbb4fb 100644
+--- a/kernel/ringgb.cc
++++ b/kernel/ringgb.cc
+@@ -8,7 +8,7 @@
+ //#define HAVE_TAIL_RING
+ #define NO_BUCKETS
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/kutil.h>
+ #include <kernel/structs.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/ringgb.h b/kernel/ringgb.h
+index 79b8858..9921213 100644
+--- a/kernel/ringgb.h
++++ b/kernel/ringgb.h
+@@ -7,7 +7,7 @@
+ */
+ #ifndef RINGGB_HEADER
+ #define RINGGB_HEADER
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_RINGS
+ #include <kernel/polys.h>
+diff --git a/kernel/rintegers.cc b/kernel/rintegers.cc
+index 95b1f15..86b10f6 100644
+--- a/kernel/rintegers.cc
++++ b/kernel/rintegers.cc
+@@ -7,7 +7,7 @@
+ */
+
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+diff --git a/kernel/rmodulo2m.cc b/kernel/rmodulo2m.cc
+index 3c61878..986174a 100644
+--- a/kernel/rmodulo2m.cc
++++ b/kernel/rmodulo2m.cc
+@@ -7,7 +7,7 @@
+ */
+
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_RINGS
+ #include <omalloc/mylimits.h>
+diff --git a/kernel/rmodulon.cc b/kernel/rmodulon.cc
+index b2a05b5..cfbe541 100644
+--- a/kernel/rmodulon.cc
++++ b/kernel/rmodulon.cc
+@@ -7,7 +7,7 @@
+ */
+
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+diff --git a/kernel/sbuckets.cc b/kernel/sbuckets.cc
+index 839c7c8..6d4a110 100644
+--- a/kernel/sbuckets.cc
++++ b/kernel/sbuckets.cc
+@@ -9,7 +9,7 @@
+ * Created: 9/00
+ * Version: $Id: sbuckets.cc 13210 2010-09-17 13:36:19Z seelisch $
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #include <kernel/sbuckets.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/sca.cc b/kernel/sca.cc
+index 6147086..ff2cd80 100644
+--- a/kernel/sca.cc
++++ b/kernel/sca.cc
+@@ -19,7 +19,7 @@
+ #endif
+
+ // #define PDEBUG 2
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_PLURAL
+ // for
+diff --git a/kernel/semic.cc b/kernel/semic.cc
+index fed3484..dced520 100644
+--- a/kernel/semic.cc
++++ b/kernel/semic.cc
+@@ -7,7 +7,7 @@
+
+ #define SEMIC_CC
+
+-#include"mod2.h"
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_SPECTRUM
+
+diff --git a/kernel/shiftgb.cc b/kernel/shiftgb.cc
+index 3dc9189..6be6893 100644
+--- a/kernel/shiftgb.cc
++++ b/kernel/shiftgb.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: kernel: utils for shift GB and free GB
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_SHIFTBBA
+ #include <kernel/febase.h>
+diff --git a/kernel/shortfl.cc b/kernel/shortfl.cc
+index 9bed2bb..dd29897 100644
+--- a/kernel/shortfl.cc
++++ b/kernel/shortfl.cc
+@@ -8,7 +8,7 @@
+ */
+
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+diff --git a/kernel/sparsmat.cc b/kernel/sparsmat.cc
+index 2bfbde6..9626efd 100644
+--- a/kernel/sparsmat.cc
++++ b/kernel/sparsmat.cc
+@@ -7,7 +7,7 @@
+ * ABSTRACT: operations with sparse matrices (bareiss, ...)
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <kernel/febase.h>
+ #include <kernel/intvec.h>
+diff --git a/kernel/spectrum.cc b/kernel/spectrum.cc
+index 1671a6e..98a8f4f 100644
+--- a/kernel/spectrum.cc
++++ b/kernel/spectrum.cc
+@@ -7,7 +7,7 @@
+
+ #define SPECTRUM_CC
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_SPECTRUM
+
+diff --git a/kernel/splist.cc b/kernel/splist.cc
+index c1db0ae..7a4b65a 100644
+--- a/kernel/splist.cc
++++ b/kernel/splist.cc
+@@ -7,7 +7,7 @@
+
+ #define SPLIST_CC
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_SPECTRUM
+
+diff --git a/kernel/summator.cc b/kernel/summator.cc
+index be1cb41..8814eae 100644
+--- a/kernel/summator.cc
++++ b/kernel/summator.cc
+@@ -18,7 +18,7 @@
+ #define OM_TRACK 5
+ #endif
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #ifdef HAVE_PLURAL
+ #include <kernel/summator.h>
+ #include <kernel/options.h>
+diff --git a/kernel/syz.cc b/kernel/syz.cc
+index 1061e56..eecb98c 100644
+--- a/kernel/syz.cc
++++ b/kernel/syz.cc
+@@ -8,7 +8,7 @@
+ */
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/polys.h>
+diff --git a/kernel/syz0.cc b/kernel/syz0.cc
+index c2d8cbe..69e2c44 100644
+--- a/kernel/syz0.cc
++++ b/kernel/syz0.cc
+@@ -7,7 +7,7 @@
+ */
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/polys.h>
+diff --git a/kernel/syz1.cc b/kernel/syz1.cc
+index 1367c52..7aea035 100644
+--- a/kernel/syz1.cc
++++ b/kernel/syz1.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: resolutions
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/syz2.cc b/kernel/syz2.cc
+index 636001d..67b6310 100644
+--- a/kernel/syz2.cc
++++ b/kernel/syz2.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: resolutions
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/syz3.cc b/kernel/syz3.cc
+index aff65e7..e225cd1 100644
+--- a/kernel/syz3.cc
++++ b/kernel/syz3.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: resolutions
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/tgb.cc b/kernel/tgb.cc
+index c92976e..b226497 100644
+--- a/kernel/tgb.cc
++++ b/kernel/tgb.cc
+@@ -14,7 +14,7 @@
+ ///@TODO: delay nur auf Sugarvergr?erung
+ ///@TODO: grade aus ecartS, setze dazu strat->honey; und nutze p.ecart
+ ///@TODO: no tail reductions in syz comp
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <kernel/tgb.h>
+ #include <kernel/tgb_internal.h>
+diff --git a/kernel/tgbgauss.cc b/kernel/tgbgauss.cc
+index 681a38a..ed14563 100644
+--- a/kernel/tgbgauss.cc
++++ b/kernel/tgbgauss.cc
+@@ -5,7 +5,7 @@
+ /*
+ * ABSTRACT: gauss implementation for F4
+ */
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <kernel/tgbgauss.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/tgbgauss.h b/kernel/tgbgauss.h
+index 3c9ab04..dc6cbc1 100644
+--- a/kernel/tgbgauss.h
++++ b/kernel/tgbgauss.h
+@@ -7,7 +7,7 @@
+ /*
+ * ABSTRACT: gauss implementation for F4 header
+ */
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/numbers.h>
+ //#include "tgb_internal.h"
+
+diff --git a/kernel/timer.cc b/kernel/timer.cc
+index 06d1ff4..a6ceedc 100644
+--- a/kernel/timer.cc
++++ b/kernel/timer.cc
+@@ -9,7 +9,7 @@
+ #include <sys/resource.h>
+ #include <unistd.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ int timerv = 0;
+ static double timer_resolution = TIMER_RESOLUTION;
+diff --git a/kernel/tmult.cc b/kernel/tmult.cc
+index 99113d9..05e8d8c 100644
+--- a/kernel/tmult.cc
++++ b/kernel/tmult.cc
+@@ -5,7 +5,7 @@
+ *
+ * Version: $Id: tmult.cc 14320 2011-07-04 14:48:27Z hannes $
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/numbers.h>
+ #include <kernel/polys.h>
+diff --git a/kernel/units.cc b/kernel/units.cc
+index 854dc5f..f15d0d9 100644
+--- a/kernel/units.cc
++++ b/kernel/units.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: procedures to compute with units
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+ #include <kernel/numbers.h>
+diff --git a/kernel/walkMain.cc b/kernel/walkMain.cc
+index 762a36a..6ca067c 100644
+--- a/kernel/walkMain.cc
++++ b/kernel/walkMain.cc
+@@ -7,7 +7,7 @@
+ *
+ */
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <kernel/intvec.h>
+ #include <kernel/int64vec.h>
+diff --git a/kernel/walkProc.cc b/kernel/walkProc.cc
+index f90020a..223a9ca 100644
+--- a/kernel/walkProc.cc
++++ b/kernel/walkProc.cc
+@@ -3,7 +3,7 @@
+ ****************************************/
+ /* $Id: walkProc.cc 13210 2010-09-17 13:36:19Z seelisch $ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/structs.h>
+ #include <kernel/polys.h>
+diff --git a/kernel/walkSupport.cc b/kernel/walkSupport.cc
+index ea9c1fa..ada42f7 100644
+--- a/kernel/walkSupport.cc
++++ b/kernel/walkSupport.cc
+@@ -1,5 +1,5 @@
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/intvec.h>
+ #include <kernel/int64vec.h>
+ #include <kernel/polys.h>
+diff --git a/kernel/weight.cc b/kernel/weight.cc
+index b1ea7d1..ee073aa 100644
+--- a/kernel/weight.cc
++++ b/kernel/weight.cc
+@@ -8,7 +8,7 @@
+ */
+
+ #include <math.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/polys.h>
+diff --git a/kernel/weight0.c b/kernel/weight0.c
+index 3efb3a7..ffbe6a4 100644
+--- a/kernel/weight0.c
++++ b/kernel/weight0.c
+@@ -9,7 +9,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/structs.h>
+
diff --git a/debian/patches/0010-move-libreadline-to-main-binary.patch b/debian/patches/0010-move-libreadline-to-main-binary.patch
deleted file mode 100644
index 558d159..0000000
--- a/debian/patches/0010-move-libreadline-to-main-binary.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-From 8540879674bcba6e1b5f6f4c1439439586fc55fa Mon Sep 17 00:00:00 2001
-From: "Bernhard R. Link" <brlink at debian.org>
-Date: Sun, 26 Feb 2012 13:38:14 +0100
-Subject: move libreadline to main binary
-
-and link Singular binary against libsingular instead of carrying a copy
-of everything.
----
- Singular/Makefile.in | 8 +++++---
- kernel/Makefile.in | 17 +++++++++--------
- kernel/febase.cc | 41 +++++++++++++++++++++++++++++++++++++++++
- kernel/feread.cc | 27 +--------------------------
- 4 files changed, 56 insertions(+), 37 deletions(-)
-
-diff --git a/Singular/Makefile.in b/Singular/Makefile.in
-index 588d981..2304b65 100644
---- a/Singular/Makefile.in
-+++ b/Singular/Makefile.in
-@@ -132,7 +132,7 @@ HAVE_MPSR = @HAVE_MPSR@
- #
- # Handle libSINGULAR stuff
- #
--LIBSINGULAR_LIBS =-lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc
-+LIBSINGULAR_LIBS =-lsingfac -lsingcf -lntl -lgmp -lomalloc -ldl
-
- SO_SUFFIX = so
-
-@@ -379,12 +379,14 @@ Singular-static: version.h
- ${MAKE} LD_STATIC=1 S_EXT="-static" Singular-static
- echo "#undef HAVE_STATIC" > static.h
-
-+SINGULAR_DYNAMIC = $(LIBSINGULAR_NAME) ../kernel/feread.o ../kernel/fereadl.o
-+
- Singular${S_EXT}: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
-- iparith.o tesths.cc libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS)
-+ iparith.o tesths.cc libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS) $(SINGULAR_DYNAMIC)
- ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} \
- -o Singular${S_EXT} \
- tesths.cc iparith.o mpsr_Tok.o claptmpl.o\
-- ${OBJS} ${LDFLAGS} ${LIBS} ${LD_DYN_FLAGS} ../kernel/mmalloc.o
-+ ${OBJS} $(SINGULAR_DYNAMIC) ${LDFLAGS} ${LIBS} ${LD_DYN_FLAGS} ../kernel/mmalloc.o
-
- libsingular: ${LIBSINGULAR_NAME}
-
-diff --git a/kernel/Makefile.in b/kernel/Makefile.in
-index 33fb6d9..edc1e63 100644
---- a/kernel/Makefile.in
-+++ b/kernel/Makefile.in
-@@ -91,7 +91,7 @@ endif
- # normal C++ source files
- CXXSOURCES=clapconv.cc \
- clapsing.cc \
-- febase.cc feread.cc feResource.cc \
-+ febase.cc feResource.cc \
- ffields.cc hdegree.cc hilb.cc hutil.cc \
- sca.cc gring.cc gr_kstd2.cc summator.cc ncSAMult.cc ncSAFormula.cc \
- ideals.cc intvec.cc int64vec.cc \
-@@ -119,7 +119,7 @@ CXXSOURCES=clapconv.cc \
- CXXSOURCES2 = SingularBuilder.cpp
-
- # normal C source files
--CSOURCES=weight0.c fegetopt.c fereadl.c dError.c mmstd.c
-+CSOURCES=weight0.c fegetopt.c dError.c mmstd.c
-
- # C++ sources which are used if part of the kernel are dynamically linked
- ifeq ($(DL_KERNEL),1)
-@@ -137,7 +137,8 @@ STATIC_SOURCES=p_Procs_Static.cc
-
- # special C++ source files (need extra compiling and/or linking), for which
- # dependencies should be generated
--ESOURCES=mmalloc.cc $(DL_KERNEL_SOURCES) $(DL_LIB_SOURCES) $(STATIC_SOURCES)
-+ESOURCES=mmalloc.cc $(DL_KERNEL_SOURCES) $(DL_LIB_SOURCES) $(STATIC_SOURCES) feread.cc
-+ECSOURCES=fereadl.c
-
- SOURCES=${CSOURCES} ${CXXSOURCES} \
- prCopyTemplate.cc \
-@@ -177,13 +178,13 @@ HEADERS=hutil.h idrec.h stairc.h ideals.h \
- p_Procs_Dynamic.h p_Procs_Impl.h p_Procs_Set.h \
- p_Procs.h p_Procs_Static.h p_Mult_q.h gfan.h
-
--DISTFILES=${SOURCES} ${HEADERS} ${ESOURCES} \
-+DISTFILES=${SOURCES} ${HEADERS} ${ESOURCES} ${ECSOURCES} \
- Makefile.in \
- mod2.h.in testgh install-sh mkinstalldirs \
- prCopy.pl
-
- OBJS := $(CXXSOURCES:.cc=.o) $(CSOURCES:.c=.o) #$(CXXSOURCES2:.cpp=.o)
--OBJS2 := $(ESOURCES:.cc=.o)
-+OBJS2 := $(ESOURCES:.cc=.o) $(ECSOURCES:.c=.o)
- OBJSG2 := $(ESOURCES:.cc=.og)
- OBJSP2 := $(ESOURCES:.cc=.op)
-
-@@ -338,8 +339,8 @@ maintainer-clean: distclean srcclean
- ## miscellanous targets
- ##
-
--TAGS: ${SOURCES} ${ESOURCES} ${HEADERS}
-- etags ${SOURCES} ${ESOURCES} ${HEADERS}
-+TAGS: ${SOURCES} ${ESOURCES} ${ECSOURCES} ${HEADERS}
-+ etags ${SOURCES} ${ESOURCES} ${ECSOURCES} ${HEADERS}
-
- tags:
- ctags *.c *.h *.cc *.inc
-@@ -447,7 +448,7 @@ libkernel_p.a: ${OBJP} ${DL_LIBSP} ${OBJSP2}
- echo $(@:.d=.og) $(@:.d=.op) " " \\ > $@
- $(CCM) ${CPPFLAGS} ${DEFSG} $< >> $@
-
--depend: $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(CSOURCES:.c=.d)
-+depend: $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(ECSOURCES:.c=.d) $(CSOURCES:.c=.d)
- cat *.d *.dd >depend
-
- ifeq (depend,$(wildcard depend))
-diff --git a/kernel/febase.cc b/kernel/febase.cc
-index 6d1bbd4..466a07c 100644
---- a/kernel/febase.cc
-+++ b/kernel/febase.cc
-@@ -27,6 +27,47 @@
- #include <kernel/dError.h>
- #include <kernel/options.h>
-
-+/* some stuff move here from feread.cc: */
-+
-+/* ===================================================================*/
-+/* = batch mode = */
-+/* ===================================================================*/
-+/* dummy (for batch mode): */
-+char * fe_fgets_dummy(const char *pr,char *s, int size)
-+{
-+ return NULL;
-+}
-+
-+/* ===================================================================*/
-+/* = fgets = */
-+/* ===================================================================*/
-+char * fe_fgets(const char *pr,char *s, int size)
-+{
-+ if (BVERBOSE(V_PROMPT))
-+ {
-+ fprintf(stdout,"%s",pr);
-+ }
-+ mflush();
-+ return fgets(s,size,stdin);
-+}
-+
-+char * fe_fgets_stdin_init(const char *pr,char *s, int size) __attribute__((weak));
-+char * fe_fgets_stdin_init(const char *pr,char *s, int size) {
-+ Werror("No method to read from stdin loaded!\n");
-+ return NULL;
-+}
-+extern "C" {
-+void fe_reset_input_mode (void) __attribute__((weak));
-+void fe_reset_input_mode (void)
-+{
-+}
-+}
-+
-+char * (*fe_fgets_stdin)(const char *pr,char *s, int size)
-+ = fe_fgets_stdin_init;
-+
-+/* end of some stuff move here from feread.cc */
-+
- #define fePutChar(c) fputc((unsigned char)(c),stdout)
- /*0 implementation */
-
-diff --git a/kernel/feread.cc b/kernel/feread.cc
-index f3e7f12..0b34d0e 100644
---- a/kernel/feread.cc
-+++ b/kernel/feread.cc
-@@ -36,10 +36,6 @@
- #include <unistd.h>
- #endif
-
--static char * fe_fgets_stdin_init(const char *pr,char *s, int size);
--char * (*fe_fgets_stdin)(const char *pr,char *s, int size)
-- = fe_fgets_stdin_init;
--
- extern char *iiArithGetCmd(int);
-
- /* ===================================================================*/
-@@ -295,23 +291,11 @@ char * fe_fgets_stdin_drl(const char *pr,char *s, int size)
- }
- #endif
-
--/* ===================================================================*/
--/* = fgets = */
--/* ===================================================================*/
--char * fe_fgets(const char *pr,char *s, int size)
--{
-- if (BVERBOSE(V_PROMPT))
-- {
-- fprintf(stdout,"%s",pr);
-- }
-- mflush();
-- return fgets(s,size,stdin);
--}
-
- /* ===================================================================*/
- /* = init for static rl, dyn. rl, emu. rl = */
- /* ===================================================================*/
--static char * fe_fgets_stdin_init(const char *pr,char *s, int size)
-+char * fe_fgets_stdin_init(const char *pr,char *s, int size)
- {
- #if (defined(HAVE_READLINE) || defined(HAVE_LIBREADLINE)) && !defined(HAVE_DYN_RL) && !defined(HAVE_FEREAD)
- /* Allow conditional parsing of the ~/.inputrc file. */
-@@ -399,12 +383,3 @@ static char * fe_fgets_stdin_init(const char *pr,char *s, int size)
- #endif
- }
-
--/* ===================================================================*/
--/* = batch mode = */
--/* ===================================================================*/
--/* dummy (for batch mode): */
--char * fe_fgets_dummy(const char *pr,char *s, int size)
--{
-- return NULL;
--}
--
diff --git a/debian/patches/0011-move-libreadline-to-main-binary.patch b/debian/patches/0011-move-libreadline-to-main-binary.patch
new file mode 100644
index 0000000..793b659
--- /dev/null
+++ b/debian/patches/0011-move-libreadline-to-main-binary.patch
@@ -0,0 +1,217 @@
+From 439991ea2c21afa4f7b32b0ce66c6eda434c955a Mon Sep 17 00:00:00 2001
+From: "Bernhard R. Link" <brlink at debian.org>
+Date: Sun, 26 Feb 2012 13:38:14 +0100
+Subject: move libreadline to main binary
+
+and link Singular binary against libsingular instead of carrying a copy
+of everything.
+---
+ Singular/Makefile.in | 8 +++++---
+ kernel/Makefile.in | 17 +++++++++--------
+ kernel/febase.cc | 41 +++++++++++++++++++++++++++++++++++++++++
+ kernel/feread.cc | 27 +--------------------------
+ 4 files changed, 56 insertions(+), 37 deletions(-)
+
+diff --git a/Singular/Makefile.in b/Singular/Makefile.in
+index 890b347..2d55202 100644
+--- a/Singular/Makefile.in
++++ b/Singular/Makefile.in
+@@ -132,7 +132,7 @@ HAVE_MPSR = @HAVE_MPSR@
+ #
+ # Handle libSINGULAR stuff
+ #
+-LIBSINGULAR_LIBS =-lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc
++LIBSINGULAR_LIBS =-lsingfac -lsingcf -lntl -lgmp -lomalloc -ldl
+
+ SO_SUFFIX = so
+
+@@ -375,12 +375,14 @@ Singular-static: version.h
+ ${MAKE} LD_STATIC=1 S_EXT="-static" Singular-static
+ echo "#undef HAVE_STATIC" > static.h
+
++SINGULAR_DYNAMIC = libsingular.$(SO_SUFFIX) ../kernel/feread.o ../kernel/fereadl.o
++
+ Singular${S_EXT}: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
+- iparith.o tesths.cc libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS)
++ iparith.o tesths.cc libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS) $(SINGULAR_DYNAMIC)
+ ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} \
+ -o Singular${S_EXT} \
+ tesths.cc iparith.o mpsr_Tok.o claptmpl.o\
+- ${OBJS} ${LDFLAGS} ${LIBS} ../kernel/mmalloc.o
++ ${OBJS} $(SINGULAR_DYNAMIC) ${LDFLAGS} ${LIBS} ../kernel/mmalloc.o
+
+ libsingular: libsingular.${SO_SUFFIX}
+
+diff --git a/kernel/Makefile.in b/kernel/Makefile.in
+index 33fb6d9..edc1e63 100644
+--- a/kernel/Makefile.in
++++ b/kernel/Makefile.in
+@@ -91,7 +91,7 @@ endif
+ # normal C++ source files
+ CXXSOURCES=clapconv.cc \
+ clapsing.cc \
+- febase.cc feread.cc feResource.cc \
++ febase.cc feResource.cc \
+ ffields.cc hdegree.cc hilb.cc hutil.cc \
+ sca.cc gring.cc gr_kstd2.cc summator.cc ncSAMult.cc ncSAFormula.cc \
+ ideals.cc intvec.cc int64vec.cc \
+@@ -119,7 +119,7 @@ CXXSOURCES=clapconv.cc \
+ CXXSOURCES2 = SingularBuilder.cpp
+
+ # normal C source files
+-CSOURCES=weight0.c fegetopt.c fereadl.c dError.c mmstd.c
++CSOURCES=weight0.c fegetopt.c dError.c mmstd.c
+
+ # C++ sources which are used if part of the kernel are dynamically linked
+ ifeq ($(DL_KERNEL),1)
+@@ -137,7 +137,8 @@ STATIC_SOURCES=p_Procs_Static.cc
+
+ # special C++ source files (need extra compiling and/or linking), for which
+ # dependencies should be generated
+-ESOURCES=mmalloc.cc $(DL_KERNEL_SOURCES) $(DL_LIB_SOURCES) $(STATIC_SOURCES)
++ESOURCES=mmalloc.cc $(DL_KERNEL_SOURCES) $(DL_LIB_SOURCES) $(STATIC_SOURCES) feread.cc
++ECSOURCES=fereadl.c
+
+ SOURCES=${CSOURCES} ${CXXSOURCES} \
+ prCopyTemplate.cc \
+@@ -177,13 +178,13 @@ HEADERS=hutil.h idrec.h stairc.h ideals.h \
+ p_Procs_Dynamic.h p_Procs_Impl.h p_Procs_Set.h \
+ p_Procs.h p_Procs_Static.h p_Mult_q.h gfan.h
+
+-DISTFILES=${SOURCES} ${HEADERS} ${ESOURCES} \
++DISTFILES=${SOURCES} ${HEADERS} ${ESOURCES} ${ECSOURCES} \
+ Makefile.in \
+ mod2.h.in testgh install-sh mkinstalldirs \
+ prCopy.pl
+
+ OBJS := $(CXXSOURCES:.cc=.o) $(CSOURCES:.c=.o) #$(CXXSOURCES2:.cpp=.o)
+-OBJS2 := $(ESOURCES:.cc=.o)
++OBJS2 := $(ESOURCES:.cc=.o) $(ECSOURCES:.c=.o)
+ OBJSG2 := $(ESOURCES:.cc=.og)
+ OBJSP2 := $(ESOURCES:.cc=.op)
+
+@@ -338,8 +339,8 @@ maintainer-clean: distclean srcclean
+ ## miscellanous targets
+ ##
+
+-TAGS: ${SOURCES} ${ESOURCES} ${HEADERS}
+- etags ${SOURCES} ${ESOURCES} ${HEADERS}
++TAGS: ${SOURCES} ${ESOURCES} ${ECSOURCES} ${HEADERS}
++ etags ${SOURCES} ${ESOURCES} ${ECSOURCES} ${HEADERS}
+
+ tags:
+ ctags *.c *.h *.cc *.inc
+@@ -447,7 +448,7 @@ libkernel_p.a: ${OBJP} ${DL_LIBSP} ${OBJSP2}
+ echo $(@:.d=.og) $(@:.d=.op) " " \\ > $@
+ $(CCM) ${CPPFLAGS} ${DEFSG} $< >> $@
+
+-depend: $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(CSOURCES:.c=.d)
++depend: $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(ECSOURCES:.c=.d) $(CSOURCES:.c=.d)
+ cat *.d *.dd >depend
+
+ ifeq (depend,$(wildcard depend))
+diff --git a/kernel/febase.cc b/kernel/febase.cc
+index 6d1bbd4..466a07c 100644
+--- a/kernel/febase.cc
++++ b/kernel/febase.cc
+@@ -27,6 +27,47 @@
+ #include <kernel/dError.h>
+ #include <kernel/options.h>
+
++/* some stuff move here from feread.cc: */
++
++/* ===================================================================*/
++/* = batch mode = */
++/* ===================================================================*/
++/* dummy (for batch mode): */
++char * fe_fgets_dummy(const char *pr,char *s, int size)
++{
++ return NULL;
++}
++
++/* ===================================================================*/
++/* = fgets = */
++/* ===================================================================*/
++char * fe_fgets(const char *pr,char *s, int size)
++{
++ if (BVERBOSE(V_PROMPT))
++ {
++ fprintf(stdout,"%s",pr);
++ }
++ mflush();
++ return fgets(s,size,stdin);
++}
++
++char * fe_fgets_stdin_init(const char *pr,char *s, int size) __attribute__((weak));
++char * fe_fgets_stdin_init(const char *pr,char *s, int size) {
++ Werror("No method to read from stdin loaded!\n");
++ return NULL;
++}
++extern "C" {
++void fe_reset_input_mode (void) __attribute__((weak));
++void fe_reset_input_mode (void)
++{
++}
++}
++
++char * (*fe_fgets_stdin)(const char *pr,char *s, int size)
++ = fe_fgets_stdin_init;
++
++/* end of some stuff move here from feread.cc */
++
+ #define fePutChar(c) fputc((unsigned char)(c),stdout)
+ /*0 implementation */
+
+diff --git a/kernel/feread.cc b/kernel/feread.cc
+index f3e7f12..0b34d0e 100644
+--- a/kernel/feread.cc
++++ b/kernel/feread.cc
+@@ -36,10 +36,6 @@
+ #include <unistd.h>
+ #endif
+
+-static char * fe_fgets_stdin_init(const char *pr,char *s, int size);
+-char * (*fe_fgets_stdin)(const char *pr,char *s, int size)
+- = fe_fgets_stdin_init;
+-
+ extern char *iiArithGetCmd(int);
+
+ /* ===================================================================*/
+@@ -295,23 +291,11 @@ char * fe_fgets_stdin_drl(const char *pr,char *s, int size)
+ }
+ #endif
+
+-/* ===================================================================*/
+-/* = fgets = */
+-/* ===================================================================*/
+-char * fe_fgets(const char *pr,char *s, int size)
+-{
+- if (BVERBOSE(V_PROMPT))
+- {
+- fprintf(stdout,"%s",pr);
+- }
+- mflush();
+- return fgets(s,size,stdin);
+-}
+
+ /* ===================================================================*/
+ /* = init for static rl, dyn. rl, emu. rl = */
+ /* ===================================================================*/
+-static char * fe_fgets_stdin_init(const char *pr,char *s, int size)
++char * fe_fgets_stdin_init(const char *pr,char *s, int size)
+ {
+ #if (defined(HAVE_READLINE) || defined(HAVE_LIBREADLINE)) && !defined(HAVE_DYN_RL) && !defined(HAVE_FEREAD)
+ /* Allow conditional parsing of the ~/.inputrc file. */
+@@ -399,12 +383,3 @@ static char * fe_fgets_stdin_init(const char *pr,char *s, int size)
+ #endif
+ }
+
+-/* ===================================================================*/
+-/* = batch mode = */
+-/* ===================================================================*/
+-/* dummy (for batch mode): */
+-char * fe_fgets_dummy(const char *pr,char *s, int size)
+-{
+- return NULL;
+-}
+-
diff --git a/debian/patches/0011-tag-MP-using-examples.patch b/debian/patches/0011-tag-MP-using-examples.patch
deleted file mode 100644
index d713d60..0000000
--- a/debian/patches/0011-tag-MP-using-examples.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 1a8090bb38c2e2f323ff52980789c04bdc3e03c6 Mon Sep 17 00:00:00 2001
-From: "Bernhard R. Link" <brlink at debian.org>
-Date: Sat, 3 Mar 2012 10:16:25 +0100
-Subject: tag MP using examples
-
-Properly tag all examples using MP functions, so that the documentation
-can be built even if built without MP.
----
- doc/general.doc | 8 ++++----
- doc/reference.doc | 4 ++--
- doc/types.doc | 4 ++--
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/doc/general.doc b/doc/general.doc
-index 155ef21..d3f493a 100644
---- a/doc/general.doc
-+++ b/doc/general.doc
-@@ -2913,7 +2913,7 @@ For more information, see @ref{write}, @ref{read}, @ref{dump},
-
- @strong{Example:}
- @smallexample
-- at c example unix_only
-+ at c example unix_only tag:MP
- ring r; poly p = x+y;
- dump("MPfile:w test.mp"); // dump the session to the file test.mp
- kill r; // kill the basering
-@@ -2934,7 +2934,7 @@ Links have various properties which can be queried using the
-
- @strong{Example:}
- @smallexample
-- at c example unix_only
-+ at c example unix_only tag:MP
- link l = "MPtcp:fork";
- l;
- open(l);
-@@ -2988,7 +2988,7 @@ MPfile links are implemented on Unix-like operating systems only.
-
- @strong{Example:}
- @smallexample
-- at c example unix_only
-+ at c example unix_only tag:MP
- ring r;
- // (over)write MPfile test.mp, link is specified as string
- write("MPfile:w test.mp", x+y);
-@@ -3015,7 +3015,7 @@ MPtcp links are implemented on Unix-like operating systems only.
-
- @strong{Example:}
- @smallexample
-- at c example unix_only
-+ at c example unix_only tag:MP
- ring r;
- link l = "MPtcp:launch"; // declare a link explicitly
- open(l); // needs an open, launches another SINGULAR as a server
-diff --git a/doc/reference.doc b/doc/reference.doc
-index edf78fa..472f229 100644
---- a/doc/reference.doc
-+++ b/doc/reference.doc
-@@ -1604,7 +1604,7 @@ with @code{quote} and @code{write} to
- prevent local evaluations when writing to an MPtcp link.
- @item @strong{Example:}
- @smallexample
-- at c example unix_only
-+ at c example unix_only tag:MP
- link l="MPfile:w example.mp";
- ring r=0,(x,y,z),ds;
- ideal i=maxideal(3);
-@@ -5708,7 +5708,7 @@ quote can be "undone" by an @code{eval} (i.e., each eval "undoes" the
- effect of exactly one quote).
- @item @strong{Example:}
- @smallexample
-- at c example unix_only
-+ at c example unix_only tag:MP
- link l="MPfile:w example.mp";
- ring r=0,(x,y,z),ds;
- ideal i=maxideal(3);
-diff --git a/doc/types.doc b/doc/types.doc
-index 768559d..d6a688e 100644
---- a/doc/types.doc
-+++ b/doc/types.doc
-@@ -1638,7 +1638,7 @@ either for reading or for writing, but not for both at the same time. A
-
- @*@strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:MP
- ring r;
- link l="MPfile:w example.mp"; // type=MPfile, mode=overwrite
- l;
-@@ -1786,7 +1786,7 @@ is data to read.
-
- @*@strong{Example:}
- @smallexample
-- at c example unix_only
-+ at c example unix_only tag:MP
- LIB "general.lib"; // needed for "killall" command
- link l="MPtcp:launch";
- open(l); l; // l is ready for writing but not for reading
diff --git a/debian/patches/0012-default-path-settings.patch b/debian/patches/0012-default-path-settings.patch
new file mode 100644
index 0000000..dd1c6ed
--- /dev/null
+++ b/debian/patches/0012-default-path-settings.patch
@@ -0,0 +1,58 @@
+From 8e1a0ace599552add19f1643ae4930b35e819df0 Mon Sep 17 00:00:00 2001
+From: "Bernhard R. Link" <brlink at debian.org>
+Date: Sat, 25 Feb 2012 13:47:46 +0100
+Subject: default path settings
+
+- Hardcode "Singular" pathname, so we can install the library to a
+ different location than the binaries.
+- as S_BIN_DIR and S_ROOT_DIR are the same in the Debian package,
+ don't default ROOT_DIR to BIN_DIR/..
+- xterm set as x-terminal-emulator alternative.
+- emacs binary located in /usr/bin
+- remove %b/.. and %r/.. from default search path in order to
+ not look into /usr/lib/LIB for libraries.
+---
+ kernel/feResource.cc | 14 ++++++--------
+ 1 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/kernel/feResource.cc b/kernel/feResource.cc
+index 5bb750f..445cc6d 100644
+--- a/kernel/feResource.cc
++++ b/kernel/feResource.cc
+@@ -76,13 +76,11 @@ static feResourceConfig_s feResourceConfigs[] =
+ "%b/LIB;"
+ "%b/MOD;"
+ "%r/LIB;"
+- "%r/../LIB;"
+ "%d/LIB;"
+- "%d/../LIB"
+ ""},
+- {"Singular", 'S', feResBinary,"SINGULAR_EXECUTABLE", "%d/"S_UNAME"/Singular",(char *)""},
+- {"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "%d/"S_UNAME, (char *)""},
+- {"RootDir", 'r', feResDir, "SINGULAR_ROOT_DIR", "%b/..", (char *)""},
++ {"Singular", 'S', feResBinary,"SINGULAR_EXECUTABLE", "%b/Singular",(char *)S_ROOT_DIR "/Singular"},
++ {"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "%r", (char *)""},
++ {"RootDir", 'r', feResDir, "SINGULAR_ROOT_DIR", S_ROOT_DIR, (char *)""},
+ {"DefaultDir",'d', feResDir, "SINGULAR_DEFAULT_DIR", SINGULAR_DEFAULT_DIR, (char *)""},
+ {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%r/info/singular.hlp", (char *)""},
+ {"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%r/doc/singular.idx", (char *)""},
+@@ -95,8 +93,8 @@ static feResourceConfig_s feResourceConfigs[] =
+ {"Path", 'p', feResPath, NULL, "%b;$PATH", (char *)""},
+
+ #ifdef ESINGULAR
+- {"emacs", 'E', feResBinary,"ESINGULAR_EMACS", "%b/emacs", (char *)""},
+- {"xemacs", 'A', feResBinary,"ESINGULAR_EMACS", "%b/xemacs", (char *)""},
++ {"emacs", 'E', feResBinary,"ESINGULAR_EMACS", "/usr/bin/emacs", (char *)""},
++ {"xemacs", 'A', feResBinary,"ESINGULAR_EMACS", "/usr/bin/xemacs", (char *)""},
+ {"SingularEmacs",'M', feResBinary,"ESINGULAR_SINGULAR", "%b/Singular", (char *)""},
+ {"EmacsLoad", 'l', feResFile, "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular", (char *)""},
+ {"EmacsDir", 'e', feResDir, "ESINGULAR_EMACS_DIR", "%r/emacs", (char *)""},
+@@ -105,7 +103,7 @@ static feResourceConfig_s feResourceConfigs[] =
+ #ifdef ix86_Win
+ {"rxvt", 'X', feResBinary,"RXVT", "%b/rxvt", (char *)""},
+ #else
+- {"xterm", 'X', feResBinary,"XTERM", "%b/xterm", (char *)""},
++ {"xterm", 'X', feResBinary,"XTERM", "/usr/bin/x-terminal-emulator", (char *)""},
+ #endif
+ #else
+ {"EmacsDir", 'e', feResDir, "SINGULAR_EMACS_DIR", "%r/emacs", (char *)""},
diff --git a/debian/patches/0012-tag-gfan-using-examples.patch b/debian/patches/0012-tag-gfan-using-examples.patch
deleted file mode 100644
index 6173041..0000000
--- a/debian/patches/0012-tag-gfan-using-examples.patch
+++ /dev/null
@@ -1,447 +0,0 @@
-From 7f413a32db09b1a62c5546af1e1432bb47eceed4 Mon Sep 17 00:00:00 2001
-From: "Bernhard R. Link" <brlink at debian.org>
-Date: Sat, 3 Mar 2012 10:17:51 +0100
-Subject: tag gfan using examples
-
-Tag all examples in cones.doc, so that the manual can be built
-even if compiled without gfan support.
----
- doc/cones.doc | 96 ++++++++++++++++++++++++++++----------------------------
- 1 files changed, 48 insertions(+), 48 deletions(-)
-
-diff --git a/doc/cones.doc b/doc/cones.doc
-index 0a6b855..944d2f1 100644
---- a/doc/cones.doc
-+++ b/doc/cones.doc
-@@ -53,7 +53,7 @@ vectors of L is the lineality space of the cone,
- if either bit is 0, then program computes the information itself.
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- // Let's define a cone in R^3 generated by the following half lines:
- intmat HL[5][3]=
- 1,0, 0,
-@@ -115,7 +115,7 @@ if lower bit is 1, then program assumes the kernel of E is the span of the cone,
- if either bit is 0, then program computes the information itself.
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- // Let's define a cone in R^3 given by the following inequalities:
- intmat IE[6][3]=
- 1,3,5,
-@@ -176,7 +176,7 @@ if lower bit is 1, then program assumes the kernel of E is the span of the cone,
- if either bit is 0, then program computes the information itself.
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[11][3]=
- 0,-1,1,
- -1,1,0,
-@@ -251,7 +251,7 @@ cone
- canonicalized version of the cone, no more redundant inequalities and equations
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[11][3]=
- 0,-1,1,
- -1,1,0,
-@@ -284,7 +284,7 @@ cone
- local version of the given cone around the given point of the cone
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[3][3]=
- 1,0,0,
- 0,1,0,
-@@ -316,7 +316,7 @@ int
- 1 iff c1 entirely contains c2 resp. iff c contains the given point, possibly on one of its facets; 0 otherwise
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[2][2]=
- 1,0,
- 0,1;
-@@ -353,7 +353,7 @@ int
- 1 iff the cone contains a point with positive coordinates in its relative interior; 0 otherwise
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M1[2][2]=
- 1,1,
- 1,-1;
-@@ -381,7 +381,7 @@ int
- 1 iff the given cone contains the given point in its relative interior; 0 otherwise
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[2][2]=
- 1,0,
- 0,1;
-@@ -409,7 +409,7 @@ int
- ambient dimension of the cone;
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M1[2][2]=
- 1,0,
- 0,1;
-@@ -439,7 +439,7 @@ int
- codimension of the cone;
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M1[1][2]=
- 1,0;
- cone c1=coneViaRays(M1);
-@@ -467,7 +467,7 @@ int
- dimension of the cone
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M1[1][2]=
- 1,0;
- cone c1=coneViaRays(M1);
-@@ -493,7 +493,7 @@ cone
- the dual of the cone
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M1[2][2]=
- 1,0,
- 0,1;
-@@ -526,7 +526,7 @@ intmat
- equations given by the cone
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M1[2][2]=
- 1,0,
- 0,1;
-@@ -556,7 +556,7 @@ intmat
- inner normal vectors of the facets of the cone
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M1[2][2]=
- 1,0,
- 0,1;
-@@ -586,7 +586,7 @@ intmat
- generating vectors of the lineality space of the cone
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[5][3]=
- 1,0,0,
- 0,1,0,
-@@ -613,7 +613,7 @@ intmat
- generating vectors of the span of the cone
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[3][5]=
- 1,0,0,0,0,
- 0,1,0,0,0,
-@@ -638,7 +638,7 @@ intmat
- generating vectors of the orthogonal complement of the span of the cone
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[3][5]=
- 1,0,0,0,0,
- 0,1,0,0,0,
-@@ -663,7 +663,7 @@ intmat
- inequalities given by the cone
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M1[2][2]=
- 1,0,
- 0,1;
-@@ -693,7 +693,7 @@ int
- dimension of the lineality space of the cone
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M1[3][3]=
- 1,0,0,
- 0,1,0,
-@@ -724,7 +724,7 @@ cone
- the lineality space of the cone as a new cone
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M1[3][3]=
- 1,0,0,
- 0,1,0,
-@@ -758,7 +758,7 @@ intvec
- linear forms of the cone (can be set by setLinearForms); returns empty intmat if not set
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[2][3]=
- -1,0,0,
- 0,-1,0;
-@@ -785,7 +785,7 @@ int
- multiplicity of the cone (can be set by setMultiplicity); returns 1 if not set
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[2][3]=
- -1,0,0,
- 0,-1,0;
-@@ -810,7 +810,7 @@ cone
- the negated (or negative) of the cone
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[2][2]=
- 1,0,
- 0,1;
-@@ -835,7 +835,7 @@ int
- quotient of Z^n intersected with the span of the cone with Z^n intersected with its lineality space
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[3][2]=
- 1,0,
- 0,1,
-@@ -860,7 +860,7 @@ intmat
- rays of the cone outside the lineality space, rays inside the lineality space will be ignored
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M1[2][2]=
- 1,0,
- 0,1;
-@@ -891,7 +891,7 @@ intvec
- point in the relative interior of the cone
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M1[2][2]=
- 1,0,
- 0,1;
-@@ -919,7 +919,7 @@ intvec
- if getDimension(c)=getLinealityDimension(c)+1, then the quotient lattice of Z^n intersected with the span and Z^n intersected with the lineality space is Z^1 and the class of the cone is a semigroup. returns a generator of that semigroup. (like getQuotientLatticeBasis(cone c), but as intvec)
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[3][2]=
- 1,0,
- 0,1,
-@@ -943,7 +943,7 @@ intvec
- special-purpose interior point which supports recognition of symmetries among non-intersecting cones (used in implementation of fans)
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M1[2][2]=
- 1,0,
- 0,1;
-@@ -971,7 +971,7 @@ int
- 1 iff c1 contains c2 as a face; 0 otherwise
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[2][2]=
- 1,0,
- 0,1;
-@@ -1001,7 +1001,7 @@ cone
- the intersection of the two cones
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M1[2][2]=
- 1,0,
- 0,1;
-@@ -1040,7 +1040,7 @@ int
- 1 iff the cone is the entire ambient space; 0 otherwise
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- cone c1;
- isFullSpace(c1);
- intmat M2[2][2]=
-@@ -1072,7 +1072,7 @@ int
- 1 iff the cone is just the origin of the ambient space; 0 otherwise
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- cone c1; // full cone in zero-dimensional ambient space
- isOrigin(c1);
- intmat M2[2][2]=
-@@ -1105,7 +1105,7 @@ int
- 1 iff the cone resp. fan is simplicial; 0 otherwise
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M1[3][3]=
- 1,0,0,
- 0,1,0,
-@@ -1154,7 +1154,7 @@ isSimplicial(f);
- adds the information of a linear form to the cone
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[2][3]=
- -1,0,0,
- 0,-1,0;
-@@ -1180,7 +1180,7 @@ getLinearForms(c);
- adds the information of a multiplicity to the cone
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[2][3]=
- -1,0,0,
- 0,-1,0;
-@@ -1321,7 +1321,7 @@ cone
- 1 iff c is contained in the collection of cones that is f; 0 otherwise
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- fan f=emptyFan(2);
- intmat M[2][2]=
- 1,0,
-@@ -1347,7 +1347,7 @@ cone
- cone (orbit=0) or orbit (orbit=1) of a certain index (ranges from 1 to numberOfConesOfDimension(f,2,0,0)) in a given dimension; if maximal=0, all cones and orbits are considered, if maximal=1, only maximal cones and orbits are considered
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[3][3]=
- 1,0,0,
- 0,1,0,
-@@ -1375,7 +1375,7 @@ none
- inserts the cone into the fan, checks for compatibility beforehand
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- fan f=emptyFan(3);
- f;
- intmat M[3][3]=
-@@ -1403,7 +1403,7 @@ int
- 1 iff cone is compatible with the fan; 0 otherwise
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- fan f=emptyFan(3);
- intmat M1[3][3]=
- 1,0,0,
-@@ -1441,7 +1441,7 @@ isCompatible(f,c3);
- @c 1 iff the fan is complete; 0 otherwise
- @c @item @strong{Example:}
- @c @smallexample
-- at c @c example
-+ at c @c example tag:gfan
- @c fan f=fullFan(2);
- @c isComplete(f);
- @c fan g=emptyFan(2);
-@@ -1481,7 +1481,7 @@ int
- 1 iff the fan is pure; 0 otherwise
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- fan f=fullFan(2);
- isPure(f);
- fan g=emptyFan(2);
-@@ -1513,7 +1513,7 @@ int
- number of maximal cones in f
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- fan f=emptyFan(3);
- nmaxcones(f);
- intmat M1[3][3]=
-@@ -1546,7 +1546,7 @@ int
- number of cones in f
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- fan f=emptyFan(3);
- ncones(f);
- intmat M1[3][3]=
-@@ -1579,7 +1579,7 @@ int
- number of cones (orbit=0) or orbits (orbit=1) of a given dimension; if maximal=0, then all cones are considered, if maximal=1, only maximal cones are considered
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- fan f=emptyFan(3);
- ncones(f);
- intmat M[3][3]=
-@@ -1613,7 +1613,7 @@ none
- inserts the cone into the fan, no checking of compatibility
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- fan f=emptyFan(3);
- f;
- intmat M[3][3]=
-@@ -1666,7 +1666,7 @@ a vertex of the polytope,
- if flags is 0, then program computes the information itself.
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- // Let's a polytope in R^2 generated by:
- intmat V[4][3]=
- 1,0,0,
-@@ -1707,7 +1707,7 @@ if lower bit is 1, then program assumes the kernel of E is the span of the cone,
- if either bit is 0, then program computes the information itself.
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat IE[2][3]=
- 1,0,0,
- 0,1,0;
-@@ -1752,7 +1752,7 @@ intmat
- vertices of p
- @item @strong{Example:}
- @smallexample
-- at c example
-+ at c example tag:gfan
- intmat M[4][3]=
- 1,0,0,
- 1,2,0,
diff --git a/debian/patches/0013-tag-more-examples.patch b/debian/patches/0013-tag-more-examples.patch
deleted file mode 100644
index c625c8b..0000000
--- a/debian/patches/0013-tag-more-examples.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 735beb2a8d5414b069d0c4a6ab66e1318e3c4920 Mon Sep 17 00:00:00 2001
-From: "Bernhard R. Link" <brlink at debian.org>
-Date: Sat, 3 Mar 2012 10:21:04 +0100
-Subject: tag more examples
-
-Add a way to tag all examples from a .lib file included.
-
-Use this new feature to tag some libs needed external programs,
-special features or significant memory usage in order to be able
-to build documentation on more machines.
-
-Make DOC2TEX_EXAMPLE_EXCLUSIONS a make variable, so that this
-setting can also be overridden at make invocation time.
----
- doc/Makefile.in | 6 ++++--
- doc/doc2tex.pl | 12 ++++++++++--
- doc/examples.doc | 2 +-
- doc/pl2doc.pl | 3 ++-
- doc/singular.doc | 6 +++---
- 5 files changed, 20 insertions(+), 9 deletions(-)
-
-diff --git a/doc/Makefile.in b/doc/Makefile.in
-index 39ed588..7482778 100644
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -67,10 +67,12 @@ endif
- DOC_SUBDIR = ./d2t_singular
- EX_SUBDIR = ./examples
- CHKSUM_DB = ${DOC_SUBDIR}/chksum
-+DOC2TEX_EXAMPLE_EXCLUSIONS = @DOC2TEX_EXAMPLE_EXCLUSIONS@
- DOC2TEX = ${PERL} ./doc2tex.pl -docdir ${DOC_SUBDIR} \
- -Singular ${SINGULAR} -verbose ${VERBOSE} -make ${MAKE} \
-- -exdir ${EX_SUBDIR} @DOC2TEX_EXAMPLE_EXCLUSIONS@
--PL2DOC = ${PERL} ./pl2doc.pl -db ${CHKSUM_DB}
-+ -exdir ${EX_SUBDIR} ${DOC2TEX_EXAMPLE_EXCLUSIONS}
-+TAG =
-+PL2DOC = ${PERL} ./pl2doc.pl ${TAG} -db ${CHKSUM_DB}
-
- # t2h stuff
- TMP_DIR = @TMP_DIR@
-diff --git a/doc/doc2tex.pl b/doc/doc2tex.pl
-index 3254be2..12a3382 100755
---- a/doc/doc2tex.pl
-+++ b/doc/doc2tex.pl
-@@ -539,7 +539,7 @@ sub HandleRef
-
- sub HandleLib
- {
-- my($lib, $proc, $n_fun, $n_ex, $section, $tex_file);
-+ my($lib, $proc, $n_fun, $n_ex, $section, $tex_file, $tag);
-
- if (/^\@c\s*lib\s+([^\.]+)\.lib(.*)/)
- {
-@@ -552,6 +552,14 @@ sub HandleLib
- print TEX $_;
- return;
- }
-+ if (/tag:(\w+)/)
-+ {
-+ $tag = "TAG='-tag ".$1."'";
-+ }
-+ else
-+ {
-+ $tag = '';
-+ }
-
- $proc = $1 if (/^:(.*?) /);
- $n_fun = 1 if ($no_fun || /no_fun/);
-@@ -574,7 +582,7 @@ sub HandleLib
- if ($make)
- {
- print "<lib $lib " if ($verbose);
-- System("$make $make_opts VERBOSE=$verbose $tex_file");
-+ System("$make $make_opts $tag VERBOSE=$verbose $tex_file");
- }
-
- # make sure file exists
-diff --git a/doc/examples.doc b/doc/examples.doc
-index 613f4b4..637c421 100644
---- a/doc/examples.doc
-+++ b/doc/examples.doc
-@@ -787,7 +787,7 @@ which allows ignoring all but the first j entries of vectors when
- forming the pairs in the standard basis computation.
-
- @smallexample
-- at c example
-+ at c example tag:dynlib
- ring r=0,(x,y),dp;
- module mo=[x^2-y^2,1,0,0],[xy+y^2,0,1,0],[y^2,0,0,1];
- print(mo);
-diff --git a/doc/pl2doc.pl b/doc/pl2doc.pl
-index 1c28af0..cc3a5a2 100755
---- a/doc/pl2doc.pl
-+++ b/doc/pl2doc.pl
-@@ -20,6 +20,7 @@ while (@ARGV && $ARGV[0] =~ /^-/)
- $_ = shift(@ARGV);
- if (/^-o$/) { $out_file = shift(@ARGV); next;}
- if (/^-db$/) { $db_file = shift(@ARGV); next;}
-+ if (/^-tag$/) { $tag = $tag . " tag:" . shift(@ARGV); next;}
- if (/^-no_fun$/) { $no_fun = 1;next;}
- if (/^-doc$/) { $doc = 1; next;}
- if (/^-h(elp)?$/) { print $Usage; exit;}
-@@ -120,7 +121,7 @@ unless ($no_fun)
- ($ex = &CleanUpExample($lib, $example{$procs[$i]})))
- {
- print LDOC "\@strong{Example:}\n";
-- print LDOC "\@smallexample\n\@c example\n";
-+ print LDOC "\@smallexample\n\@c example$tag\n";
- print LDOC $ex;
- print LDOC "\n\@c example\n\@end smallexample\n";
- }
-diff --git a/doc/singular.doc b/doc/singular.doc
-index ca3274d..c14fa5d 100644
---- a/doc/singular.doc
-+++ b/doc/singular.doc
-@@ -442,7 +442,7 @@ LIB "all.lib";
- @c ---------------------------------------------------------
- @node normaliz_lib, pointid_lib, normal_lib, Commutative algebra
- @subsection normaliz_lib
-- at c lib normaliz.lib
-+ at c lib normaliz.lib tag:normaliz
- @c ----------------------------------------------------------
- @node pointid_lib, primdec_lib, normaliz_lib, Commutative algebra
- @subsection pointid_lib
-@@ -474,7 +474,7 @@ LIB "all.lib";
- @c ---------------------------------------------------------
- @node sing4ti2_lib, toric_lib, sagbi_lib, Commutative algebra
- @subsection sing4ti2_lib
-- at c lib sing4ti2.lib
-+ at c lib sing4ti2.lib tag:sing4ti2
- @c ---------------------------------------------------------
- @node toric_lib, , sing4ti2_lib, Commutative algebra
- @subsection toric_lib
-@@ -531,7 +531,7 @@ iniD, reslist, sumlist, dividelist, createlist
- @c ---------------------------------------------------------
- @node sheafcoh_lib, ,reszeta_lib, Algebraic geometry
- @subsection sheafcoh_lib
-- at c lib sheafcoh.lib
-+ at c lib sheafcoh.lib tag:memory
- @c ----------------------------------------------------------------------------
- @node Singularities, Invariant theory, Algebraic geometry, SINGULAR libraries
- @section Singularities
diff --git a/debian/patches/0014-add-doc-submakes.patch b/debian/patches/0014-add-doc-submakes.patch
deleted file mode 100644
index 404723a..0000000
--- a/debian/patches/0014-add-doc-submakes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 72d7d5a0c878cdb7c0d54c835e210b71f92f9259 Mon Sep 17 00:00:00 2001
-From: "Bernhard R. Link" <brlink at debian.org>
-Date: Sat, 3 Mar 2012 10:24:38 +0100
-Subject: add doc submakes
-
-Add a + before commands invoking sub makes in doc/Makefile.in to
-avoid jobserver warnings.
----
- doc/Makefile.in | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/doc/Makefile.in b/doc/Makefile.in
-index 7482778..fd033da 100644
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -185,17 +185,17 @@ usercard.ps: usercard.dvi
- # texinfo targets
- #
- manual.tex: ${MANUAL_FILES} doc2tex.pl ${SINGULAR} singular.doc $(STANDALONE_TEXI_FILES)
-- ${DOC2TEX} -no_fun -o manual.tex singular.doc
-+ +${DOC2TEX} -no_fun -o manual.tex singular.doc
-
- singular.tex: ${MANUAL_FILES} doc2tex.pl ${LIB_TEX_FILES} ${SINGULAR} ${LIBPARSE} singular.doc $(STANDALONE_TEXI_FILES)
-- ${DOC2TEX} -o singular.tex singular.doc
-+ +${DOC2TEX} -o singular.tex singular.doc
-
- #pattern rule for tex files
- %_noEx.tex : %.doc doc2tex.pl ${SINGULAR}
-- ${DOC2TEX} -o $@ -no_ex $<
-+ +${DOC2TEX} -o $@ -no_ex $<
-
- %.tex: %.doc doc2tex.pl ${SINGULAR}
-- ${DOC2TEX} -o $@ $<
-+ +${DOC2TEX} -o $@ $<
-
- # pattern rules for lib docus
- ${DOC_SUBDIR}/%_lib.pl : ${SINGULAR_LIB_DIR}/%.lib ${LIBPARSE}
diff --git a/debian/patches/0015-avoid-segfault-in-internal-help-parser.patch b/debian/patches/0015-avoid-segfault-in-internal-help-parser.patch
deleted file mode 100644
index 99aa15d..0000000
--- a/debian/patches/0015-avoid-segfault-in-internal-help-parser.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From cd7a58d78788a23688d5d75fe07b6b22f20b1505 Mon Sep 17 00:00:00 2001
-From: "Bernhard R. Link" <brlink at debian.org>
-Date: Sat, 3 Mar 2012 13:24:47 +0100
-Subject: avoid segfault in internal help parser
-
-the dummy help parser has a maximum length of index entries that is
-too short. Increase the constant to avoid that.
----
- Singular/fehelp.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Singular/fehelp.cc b/Singular/fehelp.cc
-index 22a6781..305330a 100644
---- a/Singular/fehelp.cc
-+++ b/Singular/fehelp.cc
-@@ -1126,7 +1126,7 @@ static void heBuiltinHelp(heEntry hentry, int br)
- #define HELP_NOT_OPEN 1
- #define HELP_NOT_FOUND 2
- #define BUF_LEN 256
--#define IDX_LEN 64
-+#define IDX_LEN 256
- #define MAX_LINES 21
-
- static inline char tolow(char p)
diff --git a/debian/patches/series b/debian/patches/series
index 90be4ac..1aa9a1d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,15 +1,12 @@
-0001-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
-0002-fixing-template-install-path-in-factory-configure.in.patch
-0003-fix-build-issues.patch
-0004-default-path-settings.patch
-0005-append-suffix-to-soname.patch
-0006-add-working-all-target-to-Makefile.in.patch
-0007-miscellaneous-Makefile-template-patches.patch
-0008-assert-needs-to-be-defined-after-include-assert.h.patch
-0009-keep-mod2.h-in-Singular.patch
-0010-move-libreadline-to-main-binary.patch
-0011-tag-MP-using-examples.patch
-0012-tag-gfan-using-examples.patch
-0013-tag-more-examples.patch
-0014-add-doc-submakes.patch
-0015-avoid-segfault-in-internal-help-parser.patch
+0001-avoid-segfault-in-internal-help-parser.patch
+0002-tag-MP-using-examples.patch
+0003-tag-more-examples.patch
+0004-mark-hidden-sub-makes-in-doc.patch
+0005-tag-gfan-using-examples.patch
+0006-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
+0007-add-working-all-target-to-Makefile.in.patch
+0008-miscellaneous-Makefile.in-patches.patch
+0009-assert-needs-to-be-defined-after-include-assert.h.patch
+0010-keep-mod2.h-in-Singular.patch
+0011-move-libreadline-to-main-binary.patch
+0012-default-path-settings.patch
diff --git a/debian/rules b/debian/rules
index 08bd45c..4ea4ae3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -126,10 +126,11 @@ binary-arch: install
dh_installman
dh_link
dh_strip
- # replace in-tree .so with hardlink:
- rm debian/libsingular-$(VERSION)/usr/lib/singular-$(VERSION)/libsingular.so
- ln debian/libsingular-$(VERSION)/usr/lib/libsingular-$(VERSION).so \
- debian/libsingular-$(VERSION)/usr/lib/singular-$(VERSION)/libsingular.so
+ # add a hardlink to place found by ld.so:
+ ln debian/libsingular-$(VERSION)/usr/lib/singular-$(VERSION)/libsingular.so \
+ debian/libsingular-$(VERSION)/usr/lib/libsingular-$(VERSION).so
+ # development symlink
+ ln -sf libsingular-$(VERSION).so debian/tmp/usr/lib/libsingular.so
dh_makeshlibs
dh_shlibdeps
dh_compress
@@ -142,7 +143,6 @@ binary-arch: install
configure-stamp:
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.sub config.sub
- echo $(VERSION) > VERSION
CFLAGS="$(CFLAGS) -fPIC" \
CXXFLAGS="$(CXXFLAGS) -fPIC" \
CPPFLAGS="$(CPPFLAGS) -DMAKE_DISTRIBUTION -I../omalloc -I$(CURDIR)/factory" \
@@ -177,11 +177,12 @@ build build-arch: build-stamp
EXAMPLE_EXCLUDE=-exclude MP -exclude gfan -exclude normaliz -exclude sing4ti2 -exclude memory -exclude dynlib
build-stamp: configure-stamp
- $(MAKE) LD='$(CXX)' LIBSINGULAR_LD='$(CXX) $(LDFLAGS) -L../omalloc' LD_DYN_FLAGS2='' DL_LIBSG='' GLIBC_DYN_FIX="-lc"
+ $(MAKE) LD='$(CXX)' LIBSINGULAR_FLAGS='-shared -Wl,-soname,libsingular-$(VERSION).so $(LDFLAGS) -L../omalloc' LD_DYN_FLAGS2='' DL_LIBSG='' GLIBC_DYN_FIX="-lc"
$(MAKE) -C Singular libparse
cd Singular && ln -sf ../kernel/p_*.so .
+ mkdir -p debian/lddir && ln -sf ../../Singular/libsingular.so debian/lddir/libsingular-$(VERSION).so
SINGULAR_BIN_DIR=$(CURDIR)/Singular \
- LD_LIBRARY_PATH='$(CURDIR)/Singular'"$${LD_LIBRARY_PATH:+:$${LD_LIBRARY_PATH}}" \
+ LD_LIBRARY_PATH='$(CURDIR)/debian/lddir'"$${LD_LIBRARY_PATH:+:$${LD_LIBRARY_PATH}}" \
PATH="$(CURDIR)/Singular:$(CURDIR)/kernel:$(CURDIR)/IntegerProgramming:$$PATH" \
$(MAKE) \
DOC2TEX_EXAMPLE_EXCLUSIONS="$(EXAMPLE_EXCLUDE)" \
@@ -190,20 +191,21 @@ build-stamp: configure-stamp
-C doc \
standalone-txt standalone-html html singular.idx singular.hlp
SINGULAR_BIN_DIR=$(CURDIR)/Singular \
- LD_LIBRARY_PATH='$(CURDIR)/Singular'"$${LD_LIBRARY_PATH:+:$${LD_LIBRARY_PATH}}" \
+ LD_LIBRARY_PATH='$(CURDIR)/debian/lddir'"$${LD_LIBRARY_PATH:+:$${LD_LIBRARY_PATH}}" \
$(MAKE) \
prefix="$(CURDIR)" \
examplesdir="$(CURDIR)/doc/examples" \
SINGULAR='$(CURDIR)/Singular/Singular' \
-C emacs \
all
+ rm -r debian/lddir
touch $@
install: build-stamp
dh_testdir
dh_testroot
dh_prep
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install-libsingular
+ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install-libsingular templatedir='$${includedir}/factory/templates'
$(MAKE) -C Singular DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install
# TODO:
# $(MAKE) -C Singular DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install-sharedist
@@ -218,8 +220,6 @@ install: build-stamp
SINGULAR='$(CURDIR)/Singular/Singular' \
install_prefix=$(CURDIR)/debian/tmp/usr/share/singular-$(VERSION) \
install-sharedist
- # replace with symlink:
- ln -sf libsingular-$(VERSION).so debian/tmp/usr/lib/libsingular.so
# surfex is not included due to missing sources, so do not install wrappers, either:
rm debian/tmp/usr/lib/singular-$(VERSION)/LIB/surfex.lib
rm debian/tmp/usr/lib/singular-$(VERSION)/surfex
--
an open source computer algebra system
More information about the debian-science-commits
mailing list