[SCM] an open source computer algebra system branch, debian, updated. de98ade33af20a9fc8e6e2bb8db4a73eaad71dc4
Bernhard R. Link
brlink at debian.org
Sat Feb 25 00:08:58 UTC 2012
The following commit has been merged in the debian branch:
commit 27d536153b475756f2eccc92259b821fad753796
Author: Bernhard R. Link <brlink at debian.org>
Date: Fri Feb 24 11:45:44 2012 +0100
update debian/patches directory
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 5f75839..6cf6bae 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,5 +1,5 @@
# see git-dpm(1) from git-dpm package
-bbc36dff3a4089ffa84aefb8fb8058a04b9c2e64
+31207a76f79a74f7655b52658cedfc6d4db44928
31207a76f79a74f7655b52658cedfc6d4db44928
af80c455bead480e8e21703ac28b5a5965265887
af80c455bead480e8e21703ac28b5a5965265887
diff --git a/debian/patches/0003-run-time-include-path-fixes.patch b/debian/patches/0003-run-time-include-path-fixes.patch
new file mode 100644
index 0000000..1313abc
--- /dev/null
+++ b/debian/patches/0003-run-time-include-path-fixes.patch
@@ -0,0 +1,186 @@
+From e98840f14f3ce5aed5db4a426740588b33506735 Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Thu, 16 Feb 2012 09:12:20 +0100
+Subject: run time include path fixes
+
+ - add --with-(install-)slibdir switch, set (INSTALL_)SLIBDIR accordingly
+ - install slibs to install_slibdor
+ - use SLIBDIR, not "%b/LIB" in feResources.cc
+ - remove meaningless paths in feResources.cc
+---
+ Singular/Makefile.in | 4 ++--
+ Singular/configure | 38 ++++++++++++++++++++++++++++++++++++++
+ Singular/configure.in | 20 ++++++++++++++++++++
+ Singular/mod2.h.in | 3 +++
+ kernel/feResource.cc | 14 ++++++++++----
+ 5 files changed, 73 insertions(+), 6 deletions(-)
+
+diff --git a/Singular/Makefile.in b/Singular/Makefile.in
+index 8f004e6..4978ee6 100644
+--- a/Singular/Makefile.in
++++ b/Singular/Makefile.in
+@@ -47,9 +47,9 @@ libdir = @libdir@
+ bindir = @bindir@
+ # includes are taken from here
+ includedir = @includedir@
+-slibdir = ${prefix}/LIB
++slibdir = @slibdir@
+ install_bindir = ${install_prefix}/${SINGUNAME}
+-install_slibdir = ${install_prefix}/LIB
++install_slibdir = @install_slibdir@
+
+ ##
+ ## various programs
+diff --git a/Singular/configure b/Singular/configure
+index 6615b4a..069db60 100755
+--- a/Singular/configure
++++ b/Singular/configure
+@@ -1571,6 +1571,31 @@ EOF
+
+ fi
+
++if test "${with_install_slibdir+set}" != set; then
++ cat >> confdefs.h <<EOF
++#define INSTALL_SLIBDIR "${prefix}/lib"
++EOF
++install_slibdir="${prefix}/lib"
++else
++ cat >> confdefs.h <<EOF
++#define INSTALL_SLIBDIR "${with_install_slibdir}"
++EOF
++install_slibdir="${with_install_slibdir}"
++
++fi
++if test "${with_slibdir+set}" != set; then
++ cat >> confdefs.h <<EOF
++#define SLIBDIR "${prefix}/lib"
++EOF
++slibdir="${prefix}/lib"
++else
++ cat >> confdefs.h <<EOF
++#define SLIBDIR "${with_slibdir}"
++EOF
++slibdir="${with_slibdir}"
++
++fi
++
+ # expand exec_prefixad
+ if test "x$exec_prefix" = xNONE; then
+ exec_prefix=${prefix}/${ac_cv_singuname}
+@@ -4599,6 +4624,17 @@ if test "${with_rootdir+set}" = set; then
+ :
+ fi
+
++# Check whether --with-slibdir was given.
++if test "${with_slibdir+set}" = set; then
++ withval="$with_slibdir"
++ :
++fi
++# Check whether --with-install-slibdir was given.
++if test "${with_install_slibdir+set}" = set; then
++ withval="$with_install_slibdir"
++ :
++fi
++
+ # Check whether --with-lex or --without-lex was given.
+ if test "${with_lex+set}" = set; then
+ withval="$with_lex"
+@@ -6072,6 +6108,8 @@ s%@localstatedir@%$localstatedir%g
+ s%@libdir@%$libdir%g
+ s%@includedir@%$includedir%g
+ s%@oldincludedir@%$oldincludedir%g
++s%@slibdir@%$slibdir%g
++s%@install_slibdir@%$install_slibdir%g
+ s%@infodir@%$infodir%g
+ s%@mandir@%$mandir%g
+ s%@SINGUNAME@%$SINGUNAME%g
+diff --git a/Singular/configure.in b/Singular/configure.in
+index 9442595..70aa7fb 100644
+--- a/Singular/configure.in
++++ b/Singular/configure.in
+@@ -530,6 +530,18 @@ else
+ AC_DEFINE_UNQUOTED(S_ROOT_DIR, "${with_rootdir}")
+ fi
+
++if test "${with_slibdir+set}" != set; then
++ AC_DEFINE_UNQUOTED(SLIBDIR, "${prefix}/lib")
++else
++ AC_DEFINE_UNQUOTED(SLIBDIR, "${with_slibdir}")
++fi
++if test "${with_install_slibdir+set}" != set; then
++ slibdir="${prefix}/lib"
++else
++ slibdir="${with_install_slibdir}")
++fi
++AC_DEFINE_UNQUOTED(INSTALL_SLIBDIR, "$slibdir")
++
+ # expand exec_prefixad
+ if test "x$exec_prefix" = xNONE; then
+ exec_prefix=${prefix}/${ac_cv_singuname}
+@@ -936,6 +948,14 @@ AC_ARG_WITH(
+ [ --with-rootdir=DIR use DIR ass compiled-in root directory
+ (default is PREFIX)])
+ AC_ARG_WITH(
++ slibdir,
++ [ --with-install-slibdir=DIR install slibs to DIR
++ (default is PREFIX/lib)])
++AC_ARG_WITH(
++ slibdir,
++ [ --with-slibdir=DIR use DIR as compiled-in slib directory
++ (default is PREFIX/lib)])
++AC_ARG_WITH(
+ lex,
+ [ --with-lex=[LEX,no] uses LEX as lex program, default is flex])
+ AC_ARG_WITH(
+diff --git a/Singular/mod2.h.in b/Singular/mod2.h.in
+index 02dfd56..9676a9a 100644
+--- a/Singular/mod2.h.in
++++ b/Singular/mod2.h.in
+@@ -138,6 +138,9 @@
+ #define S_VERSION2 ""
+ /* Define uname identifier as a string */
+ #define S_UNAME ""
++/* Define slibdir */
++#define SLIBDIR ""
++#define INSTALL_SLIBDIR ""
+ /* Absolute pathname of root directory of Singular source */
+ #define S_ROOT_DIR ""
+ /* Define to enable dynamic module code */
+diff --git a/kernel/feResource.cc b/kernel/feResource.cc
+index ba0385c..de6cb29 100644
+--- a/kernel/feResource.cc
++++ b/kernel/feResource.cc
+@@ -44,6 +44,10 @@ char* feResource(const char* key, int warn = -1);
+ #define SINGULAR_DEFAULT_DIR S_ROOT_DIR
+ #endif // defined(MAKE_DISTRIBUTION)
+
++#ifndef SLIBDIR
++# define SLIBDIR "%b/LIB"
++#endif
++
+ /*****************************************************************
+ *
+ * Declarations: Data structures
+@@ -73,16 +77,18 @@ static feResourceConfig_s feResourceConfigs[] =
+ {
+ {"SearchPath", 's', feResPath, NULL,
+ "$SINGULARPATH;"
+- "%b/LIB;"
++ SLIBDIR";"
++#if 0 // these dont' make much sense, do they?
+ "%b/MOD;"
+ "%r/LIB;"
+ "%r/../LIB;"
+ "%d/LIB;"
+ "%d/../LIB"
++#endif
+ ""},
+- {"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 *)""},
++ {"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "%d/bin", (char *)""},
++ {"RootDir", 'r', feResDir, "SINGULAR_ROOT_DIR", SINGULAR_DEFAULT_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 *)""},
diff --git a/debian/patches/0003-run-time-include-paths.patch b/debian/patches/0003-run-time-include-paths.patch
deleted file mode 100644
index 9f10f18..0000000
--- a/debian/patches/0003-run-time-include-paths.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 129d081b2556ea6b98fb1728c5e1a1b7ce727c00 Mon Sep 17 00:00:00 2001
-From: Felix Salfelder <felix at salfelder.org>
-Date: Thu, 16 Feb 2012 09:12:20 +0100
-Subject: =?UTF-8?q?run=20time=20include=20paths=0A=20-=20add=20${prefix}/lib?=
- =?UTF-8?q?/singular=0A=20-=20remove=20meaningless=20paths?=
-
----
- kernel/feResource.cc | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/kernel/feResource.cc b/kernel/feResource.cc
-index ba0385c..6d1aea9 100644
---- a/kernel/feResource.cc
-+++ b/kernel/feResource.cc
-@@ -73,12 +73,14 @@ static feResourceConfig_s feResourceConfigs[] =
- {
- {"SearchPath", 's', feResPath, NULL,
- "$SINGULARPATH;"
-- "%b/LIB;"
-+ "%r/lib/singular;" // r is mostly what i'd call $PREFIX, YMMV
-+#if 0 // these dont' make much sense, do they?
- "%b/MOD;"
- "%r/LIB;"
- "%r/../LIB;"
- "%d/LIB;"
- "%d/../LIB"
-+#endif
- ""},
- {"Singular", 'S', feResBinary,"SINGULAR_EXECUTABLE", "%d/"S_UNAME"/Singular",(char *)""},
- {"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "%d/"S_UNAME, (char *)""},
diff --git a/debian/patches/0004-Fix-FTBFS-with-ld-as-needed.-LP-832790.patch b/debian/patches/0004-Fix-FTBFS-with-ld-as-needed.-LP-832790.patch
index ca8fdeb..e7d4d92 100644
--- a/debian/patches/0004-Fix-FTBFS-with-ld-as-needed.-LP-832790.patch
+++ b/debian/patches/0004-Fix-FTBFS-with-ld-as-needed.-LP-832790.patch
@@ -1,4 +1,4 @@
-From 4b6c9894dbdad7009274a04d5df236b0fb176008 Mon Sep 17 00:00:00 2001
+From 9d374c1fde49c73b8603e7f8849c341fa2795c42 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko at ubuntu.com>
Date: Wed, 14 Sep 2011 14:39:30 +0200
Subject: =?UTF-8?q?=20=20*=20Fix=20FTBFS=20with=20ld=20--as-needed.=20LP:=20?=
@@ -10,7 +10,7 @@ Subject: =?UTF-8?q?=20=20*=20Fix=20FTBFS=20with=20ld=20--as-needed.=20LP:=20?=
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Singular/Makefile.in b/Singular/Makefile.in
-index 8f004e6..3bc2c32 100644
+index 4978ee6..f9b6060 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} \
diff --git a/debian/patches/0005-append-suffix-to-soname.patch b/debian/patches/0005-append-suffix-to-soname.patch
index b644eb3..d935665 100644
--- a/debian/patches/0005-append-suffix-to-soname.patch
+++ b/debian/patches/0005-append-suffix-to-soname.patch
@@ -1,4 +1,4 @@
-From d9884bcc5309a6db6da8a8233cb3c46a4c16fafb Mon Sep 17 00:00:00 2001
+From 628f51a3e8ce784e93c3cd30605da5115b459c43 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
@@ -11,7 +11,7 @@ as make does not know about the embedded spaces...
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/Singular/Makefile.in b/Singular/Makefile.in
-index 3bc2c32..3885c42 100644
+index f9b6060..98f9645 100644
--- a/Singular/Makefile.in
+++ b/Singular/Makefile.in
@@ -137,6 +137,7 @@ LIBSINGULAR_LIBS =-lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc
diff --git a/debian/patches/0006-This-patch-fixes-the-bogus-default-targets-in-Makefi.patch b/debian/patches/0006-This-patch-fixes-the-bogus-default-targets-in-Makefi.patch
index 7337758..5b19fcb 100644
--- a/debian/patches/0006-This-patch-fixes-the-bogus-default-targets-in-Makefi.patch
+++ b/debian/patches/0006-This-patch-fixes-the-bogus-default-targets-in-Makefi.patch
@@ -1,16 +1,15 @@
-From f1280e20976aff7fcbad05114fe480f493d705f2 Mon Sep 17 00:00:00 2001
+From eff86ca2649a638c6e1b668eccc5257a61c2cf22 Mon Sep 17 00:00:00 2001
From: Felix Salfelder <felix at salfelder.org>
Date: Thu, 16 Feb 2012 11:07:25 +0100
-Subject: =?UTF-8?q?This=20patch=20fixes=20the=20bogus=20default=20targets=20?=
- =?UTF-8?q?in=20Makefile.in=0Anow=20'make\=20{all,install}'=20works=20as=20u?=
- =?UTF-8?q?sual=20and=20expected?=
+Subject: This patch fixes the bogus default targets in 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..1e1f4f3 100644
+index 8e78512..3a4d894 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,8 +24,12 @@ GUNZIP = @GUNZIP@
@@ -42,7 +41,7 @@ index 8e78512..1e1f4f3 100644
do \
echo ${MAKE} $@ in $${SUBDIR}; \
- (cd $${SUBDIR} && ${MAKE} $@ ) || exit 1;\
-+ ${MAKE} -C $$SUBDIR $@ ;\
++ ${MAKE} -C $$SUBDIR $@ || exit 1 ;\
(if test "$${SUBDIR}" = Texinfo && test -d doc; then \
for FILE in ${TEXINFO_TEX_FILES}; \
do \
diff --git a/debian/patches/0007-assert-needs-to-be-defined-after-include-assert.h.patch b/debian/patches/0007-assert-needs-to-be-defined-after-include-assert.h.patch
index a04702c..3beffcc 100644
--- a/debian/patches/0007-assert-needs-to-be-defined-after-include-assert.h.patch
+++ b/debian/patches/0007-assert-needs-to-be-defined-after-include-assert.h.patch
@@ -1,4 +1,4 @@
-From c8710571ba8c96aef1755dec9c2a10775da5bb0b Mon Sep 17 00:00:00 2001
+From 34cd12d5eeed4423a2050d67fc55e39b24dd85c6 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"?=
diff --git a/debian/patches/0008-miscellaneous-Makefile-template-patches.patch b/debian/patches/0008-miscellaneous-Makefile-template-patches.patch
index ef94437..6f1a4fa 100644
--- a/debian/patches/0008-miscellaneous-Makefile-template-patches.patch
+++ b/debian/patches/0008-miscellaneous-Makefile-template-patches.patch
@@ -1,23 +1,22 @@
-From bbc36dff3a4089ffa84aefb8fb8058a04b9c2e64 Mon Sep 17 00:00:00 2001
+From 073197dde5cd69f05805392760d4a8c320b1f0d5 Mon Sep 17 00:00:00 2001
From: Felix Salfelder <felix at salfelder.org>
Date: Thu, 16 Feb 2012 12:37:00 +0100
-Subject: =?UTF-8?q?miscellaneous=20Makefile=20template=20patches=0A=20=20=20?=
- =?UTF-8?q?=20=20-=20fix=20flags=20(mostly=20search=20paths)=0A=20=20=20=20=20?=
- =?UTF-8?q?-=20repair=20default=20and=20install=20targets=0A=20=20=20=20=20-?=
- =?UTF-8?q?=20break=20dependency=20loops=0A=20=20=20=20=20-=20weaken=20depen?=
- =?UTF-8?q?dencies=20(temporary,=20upstream=20fixes=20needed)?=
+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 | 6 ++--
+ kernel/Makefile.in | 10 ++++----
libfac/Makefile.in | 24 ++++++++++----------
omalloc/Makefile.in | 6 ++--
- 6 files changed, 67 insertions(+), 47 deletions(-)
+ 6 files changed, 69 insertions(+), 49 deletions(-)
diff --git a/Singular/Makefile.in b/Singular/Makefile.in
-index 3885c42..3b775ea 100644
+index 98f9645..b4e3b8d 100644
--- a/Singular/Makefile.in
+++ b/Singular/Makefile.in
@@ -85,7 +85,7 @@ endif
@@ -62,7 +61,7 @@ index 3885c42..3b775ea 100644
+ 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${libdir} ${LIBSINGULAR_LIBS}
++ ${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
@@ -247,25 +246,40 @@ index 1e8d80d..c80d6e1 100644
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..afba959 100644
+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 |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 |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) |mod2.h
++depend: $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(CSOURCES:.c=.d)
cat *.d *.dd >depend
ifeq (depend,$(wildcard depend))
diff --git a/debian/patches/0009-dont-copy-mod2.h-around-and-fix-header-searchpath-in.patch b/debian/patches/0009-dont-copy-mod2.h-around-and-fix-header-searchpath-in.patch
new file mode 100644
index 0000000..4bebeac
--- /dev/null
+++ b/debian/patches/0009-dont-copy-mod2.h-around-and-fix-header-searchpath-in.patch
@@ -0,0 +1,50 @@
+From fa2f269561282c8f2623be2ec97b1ba888d1cbd3 Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Wed, 22 Feb 2012 11:18:38 +0100
+Subject: dont copy mod2.h around and fix header searchpath in
+ kernel/Makefile.in
+
+copying a header around is not only a bad idea, but also it breaks all
+make-dependencies on mod2.h. since kernel is not a subdirectory of
+Singular, we need an additional -I../Singular.
+---
+ Singular/configure | 1 -
+ Singular/configure.in | 1 -
+ kernel/Makefile.in | 2 +-
+ 3 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/Singular/configure b/Singular/configure
+index 069db60..d0a3c59 100755
+--- a/Singular/configure
++++ b/Singular/configure
+@@ -6381,7 +6381,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 70aa7fb..f1067ef 100644
+--- a/Singular/configure.in
++++ b/Singular/configure.in
+@@ -1394,5 +1394,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/kernel/Makefile.in b/kernel/Makefile.in
+index 33fb6d9..86be9e8 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../Singular -I at prefix@ @CPPFLAGS@
+ DEFS = -DNDEBUG -DOM_NDEBUG -D at SING_UNAME@ @DEFS@
+ LDFLAGS = @LDFLAGS@
+ LD_DYN_FLAGS = @LD_DYN_FLAGS@
diff --git a/debian/patches/0010-fix-include-bogus-mod2.h-directive-to-mod2.h.patch b/debian/patches/0010-fix-include-bogus-mod2.h-directive-to-mod2.h.patch
new file mode 100644
index 0000000..7be0427
--- /dev/null
+++ b/debian/patches/0010-fix-include-bogus-mod2.h-directive-to-mod2.h.patch
@@ -0,0 +1,2611 @@
+From 31207a76f79a74f7655b52658cedfc6d4db44928 Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Wed, 22 Feb 2012 11:20:57 +0100
+Subject: fix #include <bogus/mod2.h> directive to "mod2.h"
+
+From the manual: #include "file"
+ This variant is used for header files of your own program. It
+searches for a file named file first in the directory containing the
+current file, then in the quote directories and then the same
+directories used for <file>. You can prepend directories to the list of
+quote directories with the -iquote option.
+---
+ Singular/Minor.cc | 2 +-
+ Singular/MinorInterface.cc | 2 +-
+ Singular/MinorProcessor.cc | 2 +-
+ Singular/attrib.cc | 2 +-
+ Singular/bbcone.cc | 2 +-
+ Singular/bbfan.cc | 2 +-
+ Singular/bbpolytope.cc | 2 +-
+ Singular/bigintm.cc | 2 +-
+ Singular/blackbox.cc | 2 +-
+ Singular/calcSVD.cc | 2 +-
+ Singular/claptmpl.cc | 2 +-
+ Singular/cntrlc.cc | 2 +-
+ Singular/denom_list.cc | 2 +-
+ 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/gentable.cc | 2 +-
+ Singular/gentable2.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.cc | 2 +-
+ Singular/libparse.l | 2 +-
+ Singular/libsingular.h | 2 +-
+ Singular/lists.cc | 2 +-
+ Singular/locals.h | 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/newstruct.cc | 2 +-
+ Singular/pcv.cc | 2 +-
+ Singular/pyobject.cc | 2 +-
+ Singular/pyobject_setup.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/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 +-
+ 189 files changed, 189 insertions(+), 189 deletions(-)
+
+diff --git a/Singular/Minor.cc b/Singular/Minor.cc
+index 402d7e6..b2a4fb9 100644
+--- a/Singular/Minor.cc
++++ b/Singular/Minor.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include "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..de7380f 100644
+--- a/Singular/MinorInterface.cc
++++ b/Singular/MinorInterface.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include "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..2476bc4 100644
+--- a/Singular/MinorProcessor.cc
++++ b/Singular/MinorProcessor.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include "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..7279d93 100644
+--- a/Singular/attrib.cc
++++ b/Singular/attrib.cc
+@@ -13,7 +13,7 @@
+ #include <ctype.h>
+ #include <unistd.h>
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+ #include <omalloc/omalloc.h>
+ #include <kernel/options.h>
+ #include <Singular/tok.h>
+diff --git a/Singular/bbcone.cc b/Singular/bbcone.cc
+index 4fa0517..becfa8b 100644
+--- a/Singular/bbcone.cc
++++ b/Singular/bbcone.cc
+@@ -1,4 +1,4 @@
+-#include <Singular/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_FANS
+
+diff --git a/Singular/bbfan.cc b/Singular/bbfan.cc
+index 866a50d..d67731a 100644
+--- a/Singular/bbfan.cc
++++ b/Singular/bbfan.cc
+@@ -1,4 +1,4 @@
+-#include <Singular/mod2.h>
++#include "mod2.h"
+ #ifdef HAVE_FANS
+
+ #include <Singular/ipid.h>
+diff --git a/Singular/bbpolytope.cc b/Singular/bbpolytope.cc
+index 8d60edc..60cf7c8 100644
+--- a/Singular/bbpolytope.cc
++++ b/Singular/bbpolytope.cc
+@@ -1,4 +1,4 @@
+-#include <Singular/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_FANS
+
+diff --git a/Singular/bigintm.cc b/Singular/bigintm.cc
+index 60e1ef2..036bcbc 100644
+--- a/Singular/bigintm.cc
++++ b/Singular/bigintm.cc
+@@ -3,7 +3,7 @@
+ //
+ #if 0
+ //
+-#include <Singular/mod2.h>
++#include "mod2.h"
+ #include <Singular/ipid.h>
+ #include <Singular/blackbox.h>
+ #include <omalloc/omalloc.h>
+diff --git a/Singular/blackbox.cc b/Singular/blackbox.cc
+index f7f2e5f..64bf62c 100644
+--- a/Singular/blackbox.cc
++++ b/Singular/blackbox.cc
+@@ -1,4 +1,4 @@
+-#include <Singular/mod2.h>
++#include "mod2.h"
+ #include <Singular/tok.h>
+ #include <Singular/subexpr.h>
+ #include <Singular/ipshell.h>
+diff --git a/Singular/calcSVD.cc b/Singular/calcSVD.cc
+index bf80b3c..de7b3ac 100644
+--- a/Singular/calcSVD.cc
++++ b/Singular/calcSVD.cc
+@@ -1,5 +1,5 @@
+ #include <stdio.h>
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_SVD
+
+diff --git a/Singular/claptmpl.cc b/Singular/claptmpl.cc
+index 1038422..6d78421 100644
+--- a/Singular/claptmpl.cc
++++ b/Singular/claptmpl.cc
+@@ -7,7 +7,7 @@
+ * ABSTRACT - instantiation of all templates
+ */
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+ //#include <vector>
+ //using namespace std;
+ #ifdef HAVE_FACTORY
+diff --git a/Singular/cntrlc.cc b/Singular/cntrlc.cc
+index c327a19..a947f6f 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 "mod2.h"
+ #include <omalloc/omalloc.h>
+ #include <Singular/tok.h>
+ #include <Singular/ipshell.h>
+diff --git a/Singular/denom_list.cc b/Singular/denom_list.cc
+index cd442b6..e45e0c4 100644
+--- a/Singular/denom_list.cc
++++ b/Singular/denom_list.cc
+@@ -1,4 +1,4 @@
+-#include <Singular/mod2.h>
++#include "mod2.h"
+ #include <kernel/kutil.h>
+ #include <Singular/lists.h>
+
+diff --git a/Singular/eigenval_ip.cc b/Singular/eigenval_ip.cc
+index 8a69599..ef07f0b 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 "mod2.h"
+
+ #ifdef HAVE_EIGENVAL
+
+diff --git a/Singular/emacs.cc b/Singular/emacs.cc
+index ced2f19..f7c15c1 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 "mod2.h"
+ #include <Singular/version.h>
+ #include <omalloc/omalloc.h>
+
+diff --git a/Singular/extra.cc b/Singular/extra.cc
+index 9a8f021..fc14156 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 "mod2.h"
+ #include <misc_ip.h>
+
+ #ifdef TIME_WITH_SYS_TIME
+diff --git a/Singular/feOpt.cc b/Singular/feOpt.cc
+index 2421ba0..614304f 100644
+--- a/Singular/feOpt.cc
++++ b/Singular/feOpt.cc
+@@ -8,7 +8,7 @@
+
+ #include <string.h>
+ #include <stdlib.h>
+-#include <kernel/mod2.h>
++#include "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..299bfe2 100644
+--- a/Singular/fehelp.cc
++++ b/Singular/fehelp.cc
+@@ -13,7 +13,7 @@
+ #include <stdlib.h>
+ #include <time.h>
+
+-#include <kernel/mod2.h>
++#include "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..fb26676 100644
+--- a/Singular/fglm.cc
++++ b/Singular/fglm.cc
+@@ -16,7 +16,7 @@
+ * lying in a 0-dimensional ideal.
+ */
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_FACTORY
+ #include <Singular/tok.h>
+diff --git a/Singular/gentable.cc b/Singular/gentable.cc
+index 6e6dd17..da945df 100644
+--- a/Singular/gentable.cc
++++ b/Singular/gentable.cc
+@@ -14,7 +14,7 @@
+ #include <time.h>
+ #include <unistd.h>
+
+-#include <Singular/mod2.h>
++#include "mod2.h"
+ #include <Singular/tok.h>
+ #include <Singular/grammar.h>
+
+diff --git a/Singular/gentable2.cc b/Singular/gentable2.cc
+index f264321..d3a312e 100644
+--- a/Singular/gentable2.cc
++++ b/Singular/gentable2.cc
+@@ -14,7 +14,7 @@
+ #include <time.h>
+ #include <unistd.h>
+
+-#include <Singular/mod2.h>
++#include "mod2.h"
+ #include <Singular/tok.h>
+ #include <Singular/grammar.h>
+
+diff --git a/Singular/gms.cc b/Singular/gms.cc
+index 7e7880e..4e847fb 100644
+--- a/Singular/gms.cc
++++ b/Singular/gms.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: Gauss-Manin system normal form
+ */
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_GMS
+
+diff --git a/Singular/grammar.cc b/Singular/grammar.cc
+index 72ca79a..3a14b40 100644
+--- a/Singular/grammar.cc
++++ b/Singular/grammar.cc
+@@ -319,7 +319,7 @@
+ #include <stdarg.h>
+ #include <string.h>
+
+-#include <kernel/mod2.h>
++#include "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..523a078 100644
+--- a/Singular/grammar.y
++++ b/Singular/grammar.y
+@@ -12,7 +12,7 @@
+ #include <stdarg.h>
+ #include <string.h>
+
+-#include <kernel/mod2.h>
++#include "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..e8e21be 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 "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..33acfac 100644
+--- a/Singular/iparith.cc
++++ b/Singular/iparith.cc
+@@ -12,7 +12,7 @@
+ #include <time.h>
+ #include <unistd.h>
+
+-#include <kernel/mod2.h>
++#include "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..9d48e35 100644
+--- a/Singular/ipassign.cc
++++ b/Singular/ipassign.cc
+@@ -12,7 +12,7 @@
+ #include <string.h>
+ #include <ctype.h>
+
+-#include <kernel/mod2.h>
++#include "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..03c0677 100644
+--- a/Singular/ipconv.cc
++++ b/Singular/ipconv.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: automatic type conversions
+ */
+
+-#include <kernel/mod2.h>
++#include "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..71ffb2a 100644
+--- a/Singular/ipid.cc
++++ b/Singular/ipid.cc
+@@ -7,7 +7,7 @@
+
+ #include <string.h>
+
+-#include <kernel/mod2.h>
++#include "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..60843c4 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 "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..7f003ce 100644
+--- a/Singular/ipprint.cc
++++ b/Singular/ipprint.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: interpreter: printing
+ */
+
+-#include <kernel/mod2.h>
++#include "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..eae1998 100644
+--- a/Singular/ipshell.cc
++++ b/Singular/ipshell.cc
+@@ -11,7 +11,7 @@
+ #include <ctype.h>
+ #include <math.h>
+
+-#include <kernel/mod2.h>
++#include "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..7d8f160 100755
+--- a/Singular/janet.cc
++++ b/Singular/janet.cc
+@@ -3,7 +3,7 @@
+ #include <string.h>
+ #include <time.h>
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+ #include <omalloc/omalloc.h>
+ #include <kernel/polys.h>
+ #include <kernel/numbers.h>
+diff --git a/Singular/libparse.cc b/Singular/libparse.cc
+index e498651..3645016 100644
+--- a/Singular/libparse.cc
++++ b/Singular/libparse.cc
+@@ -1056,7 +1056,7 @@ char *yytext;
+ #include <string.h>
+ #include <stdlib.h>
+ #include <ctype.h>
+-#include <Singular/mod2.h>
++#include "mod2.h"
+ #ifdef STANDALONE_PARSER
+ #include "utils.h"
+ #define HAVE_LIBPARSER
+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/libsingular.h b/Singular/libsingular.h
+index 519a8ac..350b97e 100644
+--- a/Singular/libsingular.h
++++ b/Singular/libsingular.h
+@@ -2,7 +2,7 @@
+ #define SINGULAR__H
+
+ #include <math.h>
+-#include <singular/mod2.h>
++#include "mod2.h"
+ #include <singular/structs.h>
+ #include <singular/polys.h>
+ #include <singular/longrat.h>
+diff --git a/Singular/lists.cc b/Singular/lists.cc
+index d66f29d..e9500f2 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 "mod2.h"
+ #include <Singular/tok.h>
+ #include <kernel/febase.h>
+ //#include "ipid.h"
+diff --git a/Singular/locals.h b/Singular/locals.h
+index d5e3739..0a51f3c 100644
+--- a/Singular/locals.h
++++ b/Singular/locals.h
+@@ -3,7 +3,7 @@
+ * part of modgen
+ */
+
+-#include <Singular/mod2.h>
++#include "mod2.h"
+ #include <Singular/tok.h>
+ #include <Singular/ipid.h>
+ //#include <mmemory.h>
+diff --git a/Singular/maps_ip.cc b/Singular/maps_ip.cc
+index c74e8fd..8e2e7ec 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 "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..569022a 100644
+--- a/Singular/minpoly.cc
++++ b/Singular/minpoly.cc
+@@ -5,7 +5,7 @@
+
+
+ #include<cmath>
+-#include<Singular/mod2.h>
++#include "mod2.h"
+ //#include<iomanip>
+
+ #include "minpoly.h"
+diff --git a/Singular/misc_ip.cc b/Singular/misc_ip.cc
+index 43c1629..41ad54d 100644
+--- a/Singular/misc_ip.cc
++++ b/Singular/misc_ip.cc
+@@ -14,7 +14,7 @@
+ /*****************************************************************************/
+
+ // include header files
+-#include <kernel/mod2.h>
++#include "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..6794379 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 "mod2.h"
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/mpsr_Get.cc b/Singular/mpsr_Get.cc
+index 6708165..19e2a99 100644
+--- a/Singular/mpsr_Get.cc
++++ b/Singular/mpsr_Get.cc
+@@ -13,7 +13,7 @@
+ *
+ ***************************************************************/
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/mpsr_GetMisc.cc b/Singular/mpsr_GetMisc.cc
+index fda7ac3..83e34b7 100644
+--- a/Singular/mpsr_GetMisc.cc
++++ b/Singular/mpsr_GetMisc.cc
+@@ -13,7 +13,7 @@
+ *
+ ***************************************************************/
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/mpsr_GetPoly.cc b/Singular/mpsr_GetPoly.cc
+index de57603..3b685d7 100644
+--- a/Singular/mpsr_GetPoly.cc
++++ b/Singular/mpsr_GetPoly.cc
+@@ -12,7 +12,7 @@
+ *
+ *
+ ***************************************************************/
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_MPSR
+ #include "mylimits.h"
+diff --git a/Singular/mpsr_Put.cc b/Singular/mpsr_Put.cc
+index ca868a5..1aa5e5b 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 "mod2.h"
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/mpsr_PutPoly.cc b/Singular/mpsr_PutPoly.cc
+index 51c67de..9eea2f8 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 "mod2.h"
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/mpsr_Tok.cc b/Singular/mpsr_Tok.cc
+index 8d8873c..b0b5c85 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 "mod2.h"
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/mpsr_sl.cc b/Singular/mpsr_sl.cc
+index 39224f3..350933f 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 "mod2.h"
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/ndbm.cc b/Singular/ndbm.cc
+index c6f4e11..ee64797 100644
+--- a/Singular/ndbm.cc
++++ b/Singular/ndbm.cc
+@@ -14,7 +14,7 @@
+ //
+ //**************************************************************************/
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+ #ifdef HAVE_DBM
+ #ifndef HPUX_9
+ #include <strings.h>
+diff --git a/Singular/newstruct.cc b/Singular/newstruct.cc
+index 94ff9fc..576114d 100644
+--- a/Singular/newstruct.cc
++++ b/Singular/newstruct.cc
+@@ -1,6 +1,6 @@
+ #include <ctype.h>
+
+-#include <Singular/mod2.h>
++#include "mod2.h"
+ #include <Singular/ipid.h>
+ #include <Singular/blackbox.h>
+ #include <Singular/lists.h>
+diff --git a/Singular/pcv.cc b/Singular/pcv.cc
+index de543be..a9be056 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 "mod2.h"
+
+ #ifdef HAVE_PCV
+ //#if !defined(HAVE_DYNAMIC_LOADING) || defined(BUILD_MODULE)
+diff --git a/Singular/pyobject.cc b/Singular/pyobject.cc
+index 46a8279..ecdd44c 100644
+--- a/Singular/pyobject.cc
++++ b/Singular/pyobject.cc
+@@ -16,7 +16,7 @@
+
+
+
+-#include <Singular/mod2.h>
++#include "mod2.h"
+
+ #include <Singular/ipid.h>
+ #include <Singular/blackbox.h>
+diff --git a/Singular/pyobject_setup.cc b/Singular/pyobject_setup.cc
+index 79d87ed..a5f5f2e 100644
+--- a/Singular/pyobject_setup.cc
++++ b/Singular/pyobject_setup.cc
+@@ -12,7 +12,7 @@
+ **/
+ //*****************************************************************************
+
+-#include <Singular/mod2.h>
++#include "mod2.h"
+ #include <kernel/febase.h>
+ #include "static.h"
+
+diff --git a/Singular/scanner.cc b/Singular/scanner.cc
+index bbe8eea..a3fba9b 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 "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..dfdacf4 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 "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..5c292b2 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 "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..e3ed834 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 "mod2.h"
+
+ #ifdef HAVE_DBM
+
+diff --git a/Singular/sing_win.cc b/Singular/sing_win.cc
+index b2fc5ea..e569c14 100644
+--- a/Singular/sing_win.cc
++++ b/Singular/sing_win.cc
+@@ -7,7 +7,7 @@
+ * ABSTRACT: Windows specific routines
+ */
+
+-#include <kernel/mod2.h>
++#include "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..bfaa5a8 100644
+--- a/Singular/slInit_Dynamic.cc
++++ b/Singular/slInit_Dynamic.cc
+@@ -14,7 +14,7 @@
+ * MP link Extension inits
+ *
+ ***************************************************************/
+-#include <kernel/mod2.h>
++#include "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..169b2f9 100644
+--- a/Singular/slInit_Static.cc
++++ b/Singular/slInit_Static.cc
+@@ -14,7 +14,7 @@
+ * MP link Extension inits
+ *
+ ***************************************************************/
+-#include <kernel/mod2.h>
++#include "mod2.h"
+ #include <Singular/silink.h>
+ #include <Singular/slInit.h>
+
+diff --git a/Singular/ssiLink.cc b/Singular/ssiLink.cc
+index 0705a7d..825eb21 100644
+--- a/Singular/ssiLink.cc
++++ b/Singular/ssiLink.cc
+@@ -22,7 +22,7 @@
+
+
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+ // #include "mod2.h"
+
+ #include <Singular/tok.h>
+diff --git a/Singular/subexpr.cc b/Singular/subexpr.cc
+index bba1b6d..cdcf5b5 100644
+--- a/Singular/subexpr.cc
++++ b/Singular/subexpr.cc
+@@ -11,7 +11,7 @@
+ #include <ctype.h>
+ #include <unistd.h>
+
+-#include <kernel/mod2.h>
++#include "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..3f9f392 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 "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..f06797e 100644
+--- a/Singular/walk.cc
++++ b/Singular/walk.cc
+@@ -46,7 +46,7 @@
+ #include <sys/types.h>
+
+
+-#include <kernel/mod2.h>
++#include "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..a1e42d7 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 "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..da1a393 100755
+--- a/Singular/wrapper.cc
++++ b/Singular/wrapper.cc
+@@ -1,5 +1,5 @@
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include "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..2d02c7b 100644
+--- a/kernel/F4.cc
++++ b/kernel/F4.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include "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..a8c731d 100644
+--- a/kernel/F5cData.cc
++++ b/kernel/F5cData.cc
+@@ -9,7 +9,7 @@
+ * these data types is defined.
+ */
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_F5C
+ #include <kernel/kutil.h>
+diff --git a/kernel/F5cLists.cc b/kernel/F5cLists.cc
+index daab9db..2a90e87 100644
+--- a/kernel/F5cLists.cc
++++ b/kernel/F5cLists.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_F5C
+ #include <kernel/kutil.h>
+diff --git a/kernel/GMPrat.cc b/kernel/GMPrat.cc
+index 8d73221..406604f 100644
+--- a/kernel/GMPrat.cc
++++ b/kernel/GMPrat.cc
+@@ -8,7 +8,7 @@
+
+ #define GMPRAT_CC
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_SPECTRUM
+
+diff --git a/kernel/Number.h b/kernel/Number.h
+index 4428d15..e46b9aa 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 "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..08b8ea1 100644
+--- a/kernel/Poly.h
++++ b/kernel/Poly.h
+@@ -4,7 +4,7 @@
+
+ #ifndef POLYCPP_HEADER
+ #define POLYCPP_HEADER
+-#include <kernel/mod2.h>
++#include "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..3e3a169 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 "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..50d0b8c 100644
+--- a/kernel/clapconv.cc
++++ b/kernel/clapconv.cc
+@@ -8,7 +8,7 @@
+ */
+
+
+-#include <kernel/mod2.h>
++#include "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..0ddc961 100644
+--- a/kernel/clapsing.cc
++++ b/kernel/clapsing.cc
+@@ -8,7 +8,7 @@
+ */
+
+ //#define FACTORIZE2_DEBUG
+-#include <kernel/mod2.h>
++#include "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..648876b 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 "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..9e4ad58 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 "mod2.h"
+ #include <kernel/ring.h>
+
+ #include <kernel/digitech.h>
+diff --git a/kernel/digitech.h b/kernel/digitech.h
+index b8d0fd3..1d37d17 100644
+--- a/kernel/digitech.h
++++ b/kernel/digitech.h
+@@ -1,6 +1,6 @@
+ #ifndef DIGITECH_HEADER
+ #define DIGITECH_HEADER
+-#include <kernel/mod2.h>
++#include "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..356d8f2 100644
+--- a/kernel/eigenval.cc
++++ b/kernel/eigenval.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: eigenvalues of constant square matrices
+ */
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_EIGENVAL
+
+diff --git a/kernel/f5c.cc b/kernel/f5c.cc
+index c1e3b33..4f175fc 100644
+--- a/kernel/f5c.cc
++++ b/kernel/f5c.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include "mod2.h"
+ #ifdef HAVE_F5C
+ #include <unistd.h>
+ #include <kernel/structs.h>
+diff --git a/kernel/f5data.cc b/kernel/f5data.cc
+index d5c716a..50cc200 100644
+--- a/kernel/f5data.cc
++++ b/kernel/f5data.cc
+@@ -6,7 +6,7 @@
+ /*
+ * ABSTRACT: lpolynomial definition
+ */
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_F5
+ #include <kernel/kutil.h>
+diff --git a/kernel/f5gb.cc b/kernel/f5gb.cc
+index d308517..9a735b3 100644
+--- a/kernel/f5gb.cc
++++ b/kernel/f5gb.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT: f5gb interface
+ */
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+ #ifdef HAVE_F5
+ #include <unistd.h>
+ #include <omp.h>
+diff --git a/kernel/f5lists.cc b/kernel/f5lists.cc
+index ae0bcab..f60e725 100644
+--- a/kernel/f5lists.cc
++++ b/kernel/f5lists.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_F5
+ #include <kernel/kutil.h>
+diff --git a/kernel/fast_maps.cc b/kernel/fast_maps.cc
+index 4866aed..ff28211 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 "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..3128729 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 "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..87f1d2b 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 "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 de6cb29..a4dc70e 100644
+--- a/kernel/feResource.cc
++++ b/kernel/feResource.cc
+@@ -10,7 +10,7 @@
+ #include <unistd.h>
+ #include <string.h>
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+ #ifdef AIX_4
+ #define HAVE_PUTENV 1
+ #endif
+diff --git a/kernel/febase.cc b/kernel/febase.cc
+index b8a7789..e6ca370 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 "mod2.h"
+
+ #include <stdlib.h>
+ #include <stdio.h>
+diff --git a/kernel/fegetopt.c b/kernel/fegetopt.c
+index 6bac789..3a55225 100644
+--- a/kernel/fegetopt.c
++++ b/kernel/fegetopt.c
+@@ -32,7 +32,7 @@
+ */
+
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifndef __STDC__
+ # ifndef const
+diff --git a/kernel/feread.cc b/kernel/feread.cc
+index a77285b..c9b20ee 100644
+--- a/kernel/feread.cc
++++ b/kernel/feread.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: input from ttys, simulating fgets
+ */
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ // ----------------------------------------
+ // system settings:
+diff --git a/kernel/fereadl.c b/kernel/fereadl.c
+index 9f3407b..8dea4cb 100644
+--- a/kernel/fereadl.c
++++ b/kernel/fereadl.c
+@@ -7,7 +7,7 @@
+ */
+
+
+-#include <kernel/mod2.h>
++#include "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..2468e0c 100644
+--- a/kernel/ffields.cc
++++ b/kernel/ffields.cc
+@@ -7,7 +7,7 @@
+ */
+
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include "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..a1dd77e 100644
+--- a/kernel/fglmcomb.cc
++++ b/kernel/fglmcomb.cc
+@@ -8,7 +8,7 @@
+ * ABSTRACT -
+ */
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_FACTORY
+ #include <kernel/options.h>
+diff --git a/kernel/fglmgauss.cc b/kernel/fglmgauss.cc
+index 5764597..d2f2135 100644
+--- a/kernel/fglmgauss.cc
++++ b/kernel/fglmgauss.cc
+@@ -9,7 +9,7 @@
+ * to find linear dependecies of fglmVectors.
+ */
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_FACTORY
+ #include <kernel/structs.h>
+diff --git a/kernel/fglmhom.cc b/kernel/fglmhom.cc
+index 468dc2c..96e270e 100644
+--- a/kernel/fglmhom.cc
++++ b/kernel/fglmhom.cc
+@@ -10,7 +10,7 @@
+ */
+
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+ #if 0
+ #include <factoryconf.h>
+ #ifndef NOSTREAMIO
+diff --git a/kernel/fglmvec.cc b/kernel/fglmvec.cc
+index b9f90da..6560a5e 100644
+--- a/kernel/fglmvec.cc
++++ b/kernel/fglmvec.cc
+@@ -12,7 +12,7 @@
+ * specialized for this purpose.
+ */
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_FACTORY
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/fglmzero.cc b/kernel/fglmzero.cc
+index e9d3dae..3f86f55 100644
+--- a/kernel/fglmzero.cc
++++ b/kernel/fglmzero.cc
+@@ -18,7 +18,7 @@
+ * o FindUnivariatePolys added
+ */
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_FACTORY
+ #include <kernel/options.h>
+diff --git a/kernel/gfan.cc b/kernel/gfan.cc
+index ca08a3c..86ab02b 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 "mod2.h"
+
+ #ifdef HAVE_FANS
+ #include <kernel/options.h>
+diff --git a/kernel/gnumpc.cc b/kernel/gnumpc.cc
+index da6d51c..eec7adb 100644
+--- a/kernel/gnumpc.cc
++++ b/kernel/gnumpc.cc
+@@ -8,7 +8,7 @@
+ * ngc == number gnu complex
+ */
+
+-#include <kernel/mod2.h>
++#include "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..fd67c96 100644
+--- a/kernel/gnumpfl.cc
++++ b/kernel/gnumpfl.cc
+@@ -8,7 +8,7 @@
+ * ngf == number gnu floats
+ */
+
+-#include <kernel/mod2.h>
++#include "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..feb30b3 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 "mod2.h"
+
+ #ifdef HAVE_PLURAL
+
+diff --git a/kernel/gring.cc b/kernel/gring.cc
+index 5abd2cb..6f46995 100644
+--- a/kernel/gring.cc
++++ b/kernel/gring.cc
+@@ -17,7 +17,7 @@
+ #define OM_TRACK 5
+ #endif
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_PLURAL
+ #define PLURAL_INTERNAL_DECLARATIONS
+diff --git a/kernel/hdegree.cc b/kernel/hdegree.cc
+index 4706f5b..0675787 100644
+--- a/kernel/hdegree.cc
++++ b/kernel/hdegree.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT - dimension, multiplicity, HC, kbase
+ */
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+
+ #include <kernel/structs.h>
+diff --git a/kernel/hilb.cc b/kernel/hilb.cc
+index 64abe8a..83ee997 100644
+--- a/kernel/hilb.cc
++++ b/kernel/hilb.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT - Hilbert series
+ */
+
+-#include <kernel/mod2.h>
++#include "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..9bd989b 100644
+--- a/kernel/hutil.cc
++++ b/kernel/hutil.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: Utilities for staircase operations
+ */
+
+-#include <kernel/mod2.h>
++#include "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..0c6c2a2 100644
+--- a/kernel/ideals.cc
++++ b/kernel/ideals.cc
+@@ -7,7 +7,7 @@
+ */
+
+ /* includes */
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifndef NDEBUG
+ # define MYTEST 0
+diff --git a/kernel/int64vec.cc b/kernel/int64vec.cc
+index 4937c7a..123362b 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 "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..4f9f5f7 100644
+--- a/kernel/intvec.cc
++++ b/kernel/intvec.cc
+@@ -7,7 +7,7 @@
+ */
+ #ifndef INTVEC_CC
+ #define INTVEC_CC
+-#include <kernel/mod2.h>
++#include "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..57937e1 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 "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..b31f13d 100644
+--- a/kernel/khstd.cc
++++ b/kernel/khstd.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT:utils for hilbert driven kStd
+ */
+
+-#include <kernel/mod2.h>
++#include "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..814c408 100644
+--- a/kernel/kspoly.cc
++++ b/kernel/kspoly.cc
+@@ -7,7 +7,7 @@
+ */
+
+ // #define PDEBUG 2
+-#include <kernel/mod2.h>
++#include "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..0f059cb 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 "mod2.h"
+ #include <omalloc/omalloc.h>
+
+ #ifndef NDEBUG
+diff --git a/kernel/kstd2.cc b/kernel/kstd2.cc
+index 663fc1d..8af3655 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 "mod2.h"
+
+ #ifndef NDEBUG
+ # define MYTEST 0
+diff --git a/kernel/kstdfac.cc b/kernel/kstdfac.cc
+index 6d598e3..9205e65 100644
+--- a/kernel/kstdfac.cc
++++ b/kernel/kstdfac.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT - Kernel: factorizing alg. of Buchberger
+ */
+
+-#include <kernel/mod2.h>
++#include "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..06537b9 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 "mod2.h"
+
+ #ifndef NDEBUG
+ # define MYTEST 0
+diff --git a/kernel/linearAlgebra.cc b/kernel/linearAlgebra.cc
+index a06d10e..8658a24 100644
+--- a/kernel/linearAlgebra.cc
++++ b/kernel/linearAlgebra.cc
+@@ -16,7 +16,7 @@
+ /*****************************************************************************/
+
+ // include header files
+-#include <kernel/mod2.h>
++#include "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..e1421bf 100644
+--- a/kernel/longalg.cc
++++ b/kernel/longalg.cc
+@@ -7,7 +7,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include "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..50165db 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 "mod2.h"
+ #include <kernel/structs.h>
+ #include <kernel/longrat.h>
+
+diff --git a/kernel/longrat0.cc b/kernel/longrat0.cc
+index a550a2e..61b49e6 100644
+--- a/kernel/longrat0.cc
++++ b/kernel/longrat0.cc
+@@ -9,7 +9,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include "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..5786683 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 "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..2a02b32 100644
+--- a/kernel/lplist.cc
++++ b/kernel/lplist.cc
+@@ -5,7 +5,7 @@
+ /*
+ * ABSTRACT: list interface
+ */
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_F5
+
+diff --git a/kernel/maps.cc b/kernel/maps.cc
+index c1b5023..6e03cc7 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 "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..47a746a 100644
+--- a/kernel/matpol.cc
++++ b/kernel/matpol.cc
+@@ -10,7 +10,7 @@
+ #include <stdio.h>
+ #include <math.h>
+
+-#include <kernel/mod2.h>
++#include "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..910db8b 100644
+--- a/kernel/misc.cc
++++ b/kernel/misc.cc
+@@ -12,7 +12,7 @@
+ #include <stdlib.h>
+ #include <time.h>
+
+-#include <kernel/mod2.h>
++#include "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..47388ec 100644
+--- a/kernel/mmalloc.cc
++++ b/kernel/mmalloc.cc
+@@ -7,7 +7,7 @@
+ */
+ #include <stdlib.h>
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #include <omalloc/omalloc.h>
+ #include <new>
+diff --git a/kernel/mmstd.c b/kernel/mmstd.c
+index e3f144a..5614bd8 100644
+--- a/kernel/mmstd.c
++++ b/kernel/mmstd.c
+@@ -7,7 +7,7 @@
+ * i.e. (malloc/realloc/free)
+ */
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #include <omalloc/omalloc.h>
+ #include <Singular/static.h>
+diff --git a/kernel/mod_raw.cc b/kernel/mod_raw.cc
+index e388b82..4c4d39a 100644
+--- a/kernel/mod_raw.cc
++++ b/kernel/mod_raw.cc
+@@ -17,7 +17,7 @@
+ #include <sys/stat.h>
+
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+ #include <Singular/static.h>
+
+ #include <kernel/mod_raw.h>
+diff --git a/kernel/modulop.cc b/kernel/modulop.cc
+index 8b9089f..3c46b8f 100644
+--- a/kernel/modulop.cc
++++ b/kernel/modulop.cc
+@@ -6,7 +6,7 @@
+ */
+
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include "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..ce0fbaf 100644
+--- a/kernel/mpr_base.cc
++++ b/kernel/mpr_base.cc
+@@ -8,7 +8,7 @@
+
+ #include <math.h>
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #include <omalloc/mylimits.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/mpr_complex.cc b/kernel/mpr_complex.cc
+index bea595f..c62ce8e 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 "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..4e7df4f 100644
+--- a/kernel/mpr_inout.cc
++++ b/kernel/mpr_inout.cc
+@@ -8,7 +8,7 @@
+ * ABSTRACT - multipolynomial resultant
+ */
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+ //#ifdef HAVE_MPR
+
+ //-> includes
+diff --git a/kernel/mpr_numeric.cc b/kernel/mpr_numeric.cc
+index bf2e87a..47a76f1 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 "mod2.h"
+ //#ifdef HAVE_MPR
+
+ //#define mprDEBUG_ALL
+diff --git a/kernel/multicnt.cc b/kernel/multicnt.cc
+index 9f11b1d..0e46e2c 100644
+--- a/kernel/multicnt.cc
++++ b/kernel/multicnt.cc
+@@ -7,7 +7,7 @@
+
+ #define MULTICNT_CC
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_SPECTRUM
+
+diff --git a/kernel/ncSACache.cc b/kernel/ncSACache.cc
+index 99eaeb5..2e1c902 100644
+--- a/kernel/ncSACache.cc
++++ b/kernel/ncSACache.cc
+@@ -18,7 +18,7 @@
+ #endif
+
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifndef NDEBUG
+ #define OUTPUT 1
+diff --git a/kernel/ncSAFormula.cc b/kernel/ncSAFormula.cc
+index b5c6cef..590a81a 100644
+--- a/kernel/ncSAFormula.cc
++++ b/kernel/ncSAFormula.cc
+@@ -18,7 +18,7 @@
+ #endif
+
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_PLURAL
+
+diff --git a/kernel/ncSAMult.cc b/kernel/ncSAMult.cc
+index d562476..1ab004c 100644
+--- a/kernel/ncSAMult.cc
++++ b/kernel/ncSAMult.cc
+@@ -18,7 +18,7 @@
+ #endif
+
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_PLURAL
+
+diff --git a/kernel/npolygon.cc b/kernel/npolygon.cc
+index afb939b..09c074f 100644
+--- a/kernel/npolygon.cc
++++ b/kernel/npolygon.cc
+@@ -7,7 +7,7 @@
+
+ #define NPOLYGON_CC
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_SPECTRUM
+
+diff --git a/kernel/numbers.cc b/kernel/numbers.cc
+index 73714de..18e14fc 100644
+--- a/kernel/numbers.cc
++++ b/kernel/numbers.cc
+@@ -9,7 +9,7 @@
+
+ #include <string.h>
+ #include <stdlib.h>
+-#include <kernel/mod2.h>
++#include "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..7014048 100644
+--- a/kernel/pDebug.cc
++++ b/kernel/pDebug.cc
+@@ -15,7 +15,7 @@
+ #include <stdio.h>
+
+
+-#include <kernel/mod2.h>
++#include "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..79e4cc0 100644
+--- a/kernel/pInline0.cc
++++ b/kernel/pInline0.cc
+@@ -10,7 +10,7 @@
+ *******************************************************************/
+ #ifndef PINLINE0_CC
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #define PINLINE0_CC
+ #undef DO_PINLINE0
+diff --git a/kernel/pInline1.cc b/kernel/pInline1.cc
+index 68bf114..df6d190 100644
+--- a/kernel/pInline1.cc
++++ b/kernel/pInline1.cc
+@@ -11,7 +11,7 @@
+ #ifndef PINLINE1_CC
+ #define PINLINE1_CC
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef PDEBUG
+
+diff --git a/kernel/pInline2.cc b/kernel/pInline2.cc
+index 5aafa5b..8aaac52 100644
+--- a/kernel/pInline2.cc
++++ b/kernel/pInline2.cc
+@@ -10,7 +10,7 @@
+ *******************************************************************/
+ #ifndef PINLINE2_CC
+ #define PINLINE2_CC
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef PDEBUG
+
+diff --git a/kernel/pShallowCopyDelete.cc b/kernel/pShallowCopyDelete.cc
+index 3aef21c..f88233e 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 "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..4edb63c 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 "mod2.h"
+
+ /***************************************************************
+ *
+diff --git a/kernel/p_Mult_q.h b/kernel/p_Mult_q.h
+index 9000e51..1aded2f 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 "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..e76be3b 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 "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..6c858b2 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 "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..72424c8 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 "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..0194fa4 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 "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..18cf1c5 100644
+--- a/kernel/p_polys.cc
++++ b/kernel/p_polys.cc
+@@ -10,7 +10,7 @@
+ *******************************************************************/
+
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #include <kernel/structs.h>
+ #include <kernel/p_polys.h>
+diff --git a/kernel/page.c b/kernel/page.c
+index 19681d5..1b64bb6 100644
+--- a/kernel/page.c
++++ b/kernel/page.c
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include "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..03938f4 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 "mod2.h"
+
+ #include <omalloc/omalloc.h>
+ #ifdef PDEBUG
+diff --git a/kernel/polys.cc b/kernel/polys.cc
+index 65b0049..7567ce7 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 "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..b7517d8 100644
+--- a/kernel/polys0.cc
++++ b/kernel/polys0.cc
+@@ -8,7 +8,7 @@
+ */
+
+ /* includes */
+-#include <kernel/mod2.h>
++#include "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..cdf28e3 100644
+--- a/kernel/polys1.cc
++++ b/kernel/polys1.cc
+@@ -10,7 +10,7 @@
+
+ /* includes */
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include "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..6d309a8 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 "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..6ad28b5 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 "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..37f4e92 100644
+--- a/kernel/ring.cc
++++ b/kernel/ring.cc
+@@ -9,7 +9,7 @@
+
+ /* includes */
+ #include <math.h>
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/ringgb.cc b/kernel/ringgb.cc
+index 9f3814b..d521553 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 "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..e71f9ef 100644
+--- a/kernel/ringgb.h
++++ b/kernel/ringgb.h
+@@ -7,7 +7,7 @@
+ */
+ #ifndef RINGGB_HEADER
+ #define RINGGB_HEADER
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_RINGS
+ #include <kernel/polys.h>
+diff --git a/kernel/rintegers.cc b/kernel/rintegers.cc
+index 95b1f15..3ef442a 100644
+--- a/kernel/rintegers.cc
++++ b/kernel/rintegers.cc
+@@ -7,7 +7,7 @@
+ */
+
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include "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..fa0afb0 100644
+--- a/kernel/rmodulo2m.cc
++++ b/kernel/rmodulo2m.cc
+@@ -7,7 +7,7 @@
+ */
+
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_RINGS
+ #include <omalloc/mylimits.h>
+diff --git a/kernel/rmodulon.cc b/kernel/rmodulon.cc
+index b2a05b5..7e3511e 100644
+--- a/kernel/rmodulon.cc
++++ b/kernel/rmodulon.cc
+@@ -7,7 +7,7 @@
+ */
+
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include "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..d883e9d 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 "mod2.h"
+
+ #include <kernel/sbuckets.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/sca.cc b/kernel/sca.cc
+index 6147086..10acbb3 100644
+--- a/kernel/sca.cc
++++ b/kernel/sca.cc
+@@ -19,7 +19,7 @@
+ #endif
+
+ // #define PDEBUG 2
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_PLURAL
+ // for
+diff --git a/kernel/shiftgb.cc b/kernel/shiftgb.cc
+index 3dc9189..a286ab9 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 "mod2.h"
+
+ #ifdef HAVE_SHIFTBBA
+ #include <kernel/febase.h>
+diff --git a/kernel/shortfl.cc b/kernel/shortfl.cc
+index 9bed2bb..70579e7 100644
+--- a/kernel/shortfl.cc
++++ b/kernel/shortfl.cc
+@@ -8,7 +8,7 @@
+ */
+
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include "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..324a9a8 100644
+--- a/kernel/sparsmat.cc
++++ b/kernel/sparsmat.cc
+@@ -7,7 +7,7 @@
+ * ABSTRACT: operations with sparse matrices (bareiss, ...)
+ */
+
+-#include <kernel/mod2.h>
++#include "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..4f662c9 100644
+--- a/kernel/spectrum.cc
++++ b/kernel/spectrum.cc
+@@ -7,7 +7,7 @@
+
+ #define SPECTRUM_CC
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_SPECTRUM
+
+diff --git a/kernel/splist.cc b/kernel/splist.cc
+index c1db0ae..eba40c6 100644
+--- a/kernel/splist.cc
++++ b/kernel/splist.cc
+@@ -7,7 +7,7 @@
+
+ #define SPLIST_CC
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+
+ #ifdef HAVE_SPECTRUM
+
+diff --git a/kernel/summator.cc b/kernel/summator.cc
+index be1cb41..9e29971 100644
+--- a/kernel/summator.cc
++++ b/kernel/summator.cc
+@@ -18,7 +18,7 @@
+ #define OM_TRACK 5
+ #endif
+
+-#include <kernel/mod2.h>
++#include "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..8de43ec 100644
+--- a/kernel/syz.cc
++++ b/kernel/syz.cc
+@@ -8,7 +8,7 @@
+ */
+
+
+-#include <kernel/mod2.h>
++#include "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..5f8cf28 100644
+--- a/kernel/syz0.cc
++++ b/kernel/syz0.cc
+@@ -7,7 +7,7 @@
+ */
+
+
+-#include <kernel/mod2.h>
++#include "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..6575944 100644
+--- a/kernel/syz1.cc
++++ b/kernel/syz1.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: resolutions
+ */
+
+-#include <kernel/mod2.h>
++#include "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..5318f81 100644
+--- a/kernel/syz2.cc
++++ b/kernel/syz2.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: resolutions
+ */
+
+-#include <kernel/mod2.h>
++#include "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..553d5c2 100644
+--- a/kernel/syz3.cc
++++ b/kernel/syz3.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: resolutions
+ */
+
+-#include <kernel/mod2.h>
++#include "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..7841fa4 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 "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..d86c04f 100644
+--- a/kernel/tgbgauss.cc
++++ b/kernel/tgbgauss.cc
+@@ -5,7 +5,7 @@
+ /*
+ * ABSTRACT: gauss implementation for F4
+ */
+-#include <kernel/mod2.h>
++#include "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..79c8a86 100644
+--- a/kernel/tgbgauss.h
++++ b/kernel/tgbgauss.h
+@@ -7,7 +7,7 @@
+ /*
+ * ABSTRACT: gauss implementation for F4 header
+ */
+-#include <kernel/mod2.h>
++#include "mod2.h"
+ #include <kernel/numbers.h>
+ //#include "tgb_internal.h"
+
+diff --git a/kernel/timer.cc b/kernel/timer.cc
+index 06d1ff4..6263bbd 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 "mod2.h"
+
+ int timerv = 0;
+ static double timer_resolution = TIMER_RESOLUTION;
+diff --git a/kernel/tmult.cc b/kernel/tmult.cc
+index 99113d9..444dd44 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 "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..1a17e07 100644
+--- a/kernel/units.cc
++++ b/kernel/units.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: procedures to compute with units
+ */
+
+-#include <kernel/mod2.h>
++#include "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..5076a58 100644
+--- a/kernel/walkMain.cc
++++ b/kernel/walkMain.cc
+@@ -7,7 +7,7 @@
+ *
+ */
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include "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..68b76e2 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 "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..d6a0d41 100644
+--- a/kernel/walkSupport.cc
++++ b/kernel/walkSupport.cc
+@@ -1,5 +1,5 @@
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include "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..3c0aa88 100644
+--- a/kernel/weight.cc
++++ b/kernel/weight.cc
+@@ -8,7 +8,7 @@
+ */
+
+ #include <math.h>
+-#include <kernel/mod2.h>
++#include "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..85dad19 100644
+--- a/kernel/weight0.c
++++ b/kernel/weight0.c
+@@ -9,7 +9,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include "mod2.h"
+ #include <omalloc/omalloc.h>
+ #include <kernel/structs.h>
+
diff --git a/debian/patches/series b/debian/patches/series
index d6b7886..663d0d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,10 @@
0001-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
0002-fixing-template-install-path-in-factory-configure.in.patch
-0003-run-time-include-paths.patch
+0003-run-time-include-path-fixes.patch
0004-Fix-FTBFS-with-ld-as-needed.-LP-832790.patch
0005-append-suffix-to-soname.patch
0006-This-patch-fixes-the-bogus-default-targets-in-Makefi.patch
0007-assert-needs-to-be-defined-after-include-assert.h.patch
0008-miscellaneous-Makefile-template-patches.patch
+0009-dont-copy-mod2.h-around-and-fix-header-searchpath-in.patch
+0010-fix-include-bogus-mod2.h-directive-to-mod2.h.patch
--
an open source computer algebra system
More information about the debian-science-commits
mailing list