[SCM] an open source computer algebra system branch, debian, updated. 61127fed29689adb25dd64d2f78a9e7ff5997b8a
Bernhard R. Link
brlink at debian.org
Sat Feb 25 14:50:23 UTC 2012
The following commit has been merged in the debian branch:
commit 61127fed29689adb25dd64d2f78a9e7ff5997b8a
Author: Bernhard R. Link <brlink at debian.org>
Date: Sat Feb 25 15:14:54 2012 +0100
simplify (and beautify) patches
- drop adding --with-slib, using defaults again
- change default paths
- readd lost -Wl,-soname= options
- make mod2.h move more coherent with upstream
diff --git a/debian/.git-dpm b/debian/.git-dpm
index ee0bc1a..967366e 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,5 +1,5 @@
# see git-dpm(1) from git-dpm package
-31207a76f79a74f7655b52658cedfc6d4db44928
+7bf259b5aa0ebeacd6b29da8199a95bba5343100
7bf259b5aa0ebeacd6b29da8199a95bba5343100
af80c455bead480e8e21703ac28b5a5965265887
af80c455bead480e8e21703ac28b5a5965265887
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
index 78efaf4..6189d1b 100644
--- 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
@@ -1,4 +1,4 @@
-From 3342307340500f579e83dfde87ee5e6c42eaf922 Mon Sep 17 00:00:00 2001
+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
diff --git a/debian/patches/0004-Fix-FTBFS-with-ld-as-needed.-LP-832790.patch b/debian/patches/0003-fix-build-issues.patch
similarity index 89%
rename from debian/patches/0004-Fix-FTBFS-with-ld-as-needed.-LP-832790.patch
rename to debian/patches/0003-fix-build-issues.patch
index e7d4d92..af00885 100644
--- a/debian/patches/0004-Fix-FTBFS-with-ld-as-needed.-LP-832790.patch
+++ b/debian/patches/0003-fix-build-issues.patch
@@ -1,16 +1,16 @@
-From 9d374c1fde49c73b8603e7f8849c341fa2795c42 Mon Sep 17 00:00:00 2001
+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: =?UTF-8?q?=20=20*=20Fix=20FTBFS=20with=20ld=20--as-needed.=20LP:=20?=
- =?UTF-8?q?#832790.=0A=20=20*=20Resolve=20unresolved=20symbols=20in=20shared?=
- =?UTF-8?q?=20libraries.=20Closes:=20#558958?=
+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 4978ee6..f9b6060 100644
+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} \
diff --git a/debian/patches/0003-run-time-include-path-fixes.patch b/debian/patches/0003-run-time-include-path-fixes.patch
deleted file mode 100644
index 1313abc..0000000
--- a/debian/patches/0003-run-time-include-path-fixes.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-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/0004-default-path-settings.patch b/debian/patches/0004-default-path-settings.patch
new file mode 100644
index 0000000..fe970d5
--- /dev/null
+++ b/debian/patches/0004-default-path-settings.patch
@@ -0,0 +1,46 @@
+From 7684147a7a319d61714d7f3d6cef79ffa832b33f 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.
+- remove %b/.. and %r/.. from default search path in order to
+ not look into /usr/lib/LIB for libraries.
+---
+ kernel/feResource.cc | 10 ++++------
+ 1 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/kernel/feResource.cc b/kernel/feResource.cc
+index ba0385c..5633f3a 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 *)""},
+@@ -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/0005-append-suffix-to-soname.patch b/debian/patches/0005-append-suffix-to-soname.patch
index d935665..551954a 100644
--- a/debian/patches/0005-append-suffix-to-soname.patch
+++ b/debian/patches/0005-append-suffix-to-soname.patch
@@ -1,4 +1,4 @@
-From 628f51a3e8ce784e93c3cd30605da5115b459c43 Mon Sep 17 00:00:00 2001
+From c68c785b486ad4109ee0127aa6d3b5c2f594b41d 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
@@ -7,17 +7,19 @@ 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 | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ Singular/Makefile.in | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Singular/Makefile.in b/Singular/Makefile.in
-index f9b6060..98f9645 100644
+index 3bc2c32..3448874 100644
--- a/Singular/Makefile.in
+++ b/Singular/Makefile.in
-@@ -137,6 +137,7 @@ LIBSINGULAR_LIBS =-lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc
+@@ -136,7 +136,8 @@ LIBSINGULAR_LIBS =-lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc
+
SO_SUFFIX = so
- LIBSINGULAR_FLAGS = -shared
+-LIBSINGULAR_FLAGS = -shared
++LIBSINGULAR_FLAGS = -shared -Wl,-soname='$(LIBSINGULAR_NAME)'
+LIBSINGULAR_NAME = libsingular-$(shell cat ../VERSION).so
LIBSINGULAR_LD = $(CXX)
diff --git a/debian/patches/0006-This-patch-fixes-the-bogus-default-targets-in-Makefi.patch b/debian/patches/0006-add-working-all-target-to-Makefile.in.patch
similarity index 89%
rename from debian/patches/0006-This-patch-fixes-the-bogus-default-targets-in-Makefi.patch
rename to debian/patches/0006-add-working-all-target-to-Makefile.in.patch
index 5b19fcb..03e8c1a 100644
--- a/debian/patches/0006-This-patch-fixes-the-bogus-default-targets-in-Makefi.patch
+++ b/debian/patches/0006-add-working-all-target-to-Makefile.in.patch
@@ -1,7 +1,7 @@
-From eff86ca2649a638c6e1b668eccc5257a61c2cf22 Mon Sep 17 00:00:00 2001
+From a02ce6481f8b90f188c55288b494eaf58216e036 Mon Sep 17 00:00:00 2001
From: Felix Salfelder <felix at salfelder.org>
Date: Thu, 16 Feb 2012 11:07:25 +0100
-Subject: This patch fixes the bogus default targets in Makefile.in
+Subject: add working 'all' target to Makefile.in
now 'make\ {all,install}' works as usual and expected
---
@@ -9,7 +9,7 @@ now 'make\ {all,install}' works as usual and expected
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index 8e78512..3a4d894 100644
+index 8e78512..3797c90 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,8 +24,12 @@ GUNZIP = @GUNZIP@
@@ -32,7 +32,7 @@ index 8e78512..3a4d894 100644
TEXINFO_TEX_FILES = epsf.tex texinfo.tex txi-cs.tex txi-de.tex txi-no.tex
TEXINFO_TEX_DIR = Texinfo/doc
-all:
-+bogus_all:
++original_all:
echo For everybody who did not read the README: use make install
exit 1
diff --git a/debian/patches/0008-miscellaneous-Makefile-template-patches.patch b/debian/patches/0007-miscellaneous-Makefile-template-patches.patch
similarity index 99%
rename from debian/patches/0008-miscellaneous-Makefile-template-patches.patch
rename to debian/patches/0007-miscellaneous-Makefile-template-patches.patch
index 6f1a4fa..56bbead 100644
--- a/debian/patches/0008-miscellaneous-Makefile-template-patches.patch
+++ b/debian/patches/0007-miscellaneous-Makefile-template-patches.patch
@@ -1,4 +1,4 @@
-From 073197dde5cd69f05805392760d4a8c320b1f0d5 Mon Sep 17 00:00:00 2001
+From 3b95ef36368738089e67ae927c9929b56a009872 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
@@ -16,7 +16,7 @@ Subject: miscellaneous Makefile template patches
6 files changed, 69 insertions(+), 49 deletions(-)
diff --git a/Singular/Makefile.in b/Singular/Makefile.in
-index 98f9645..b4e3b8d 100644
+index 3448874..e4b7530 100644
--- a/Singular/Makefile.in
+++ b/Singular/Makefile.in
@@ -85,7 +85,7 @@ endif
diff --git a/debian/patches/0007-assert-needs-to-be-defined-after-include-assert.h.patch b/debian/patches/0008-assert-needs-to-be-defined-after-include-assert.h.patch
similarity index 91%
rename from debian/patches/0007-assert-needs-to-be-defined-after-include-assert.h.patch
rename to debian/patches/0008-assert-needs-to-be-defined-after-include-assert.h.patch
index 3beffcc..4c9d481 100644
--- a/debian/patches/0007-assert-needs-to-be-defined-after-include-assert.h.patch
+++ b/debian/patches/0008-assert-needs-to-be-defined-after-include-assert.h.patch
@@ -1,4 +1,4 @@
-From 34cd12d5eeed4423a2050d67fc55e39b24dd85c6 Mon Sep 17 00:00:00 2001
+From b49a95763138ebc3950975436ad8b57c580d7968 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/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
deleted file mode 100644
index 4bebeac..0000000
--- a/debian/patches/0009-dont-copy-mod2.h-around-and-fix-header-searchpath-in.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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/0009-keep-mod2.h-in-Singular.patch
similarity index 79%
rename from debian/patches/0010-fix-include-bogus-mod2.h-directive-to-mod2.h.patch
rename to debian/patches/0009-keep-mod2.h-in-Singular.patch
index 7be0427..710062d 100644
--- a/debian/patches/0010-fix-include-bogus-mod2.h-directive-to-mod2.h.patch
+++ b/debian/patches/0009-keep-mod2.h-in-Singular.patch
@@ -1,36 +1,27 @@
-From 31207a76f79a74f7655b52658cedfc6d4db44928 Mon Sep 17 00:00:00 2001
+From 7bf259b5aa0ebeacd6b29da8199a95bba5343100 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"
+Date: Wed, 22 Feb 2012 11:18:38 +0100
+Subject: keep mod2.h in Singular/
-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.
+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/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/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/gentable.cc | 2 +-
- Singular/gentable2.cc | 2 +-
Singular/gms.cc | 2 +-
Singular/grammar.cc | 2 +-
Singular/grammar.y | 2 +-
@@ -43,11 +34,8 @@ quote directories with the -iquote option.
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 +-
@@ -60,10 +48,8 @@ quote directories with the -iquote option.
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/pipeLink.cc | 2 +-
Singular/scanner.cc | 2 +-
Singular/scanner.l | 2 +-
Singular/sdb.cc | 2 +-
@@ -177,6 +163,7 @@ quote directories with the -iquote option.
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 +-
@@ -199,40 +186,53 @@ quote directories with the -iquote option.
kernel/walkSupport.cc | 2 +-
kernel/weight.cc | 2 +-
kernel/weight0.c | 2 +-
- 189 files changed, 189 insertions(+), 189 deletions(-)
+ 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..b2a4fb9 100644
+index 402d7e6..4e358c5 100644
--- a/Singular/Minor.cc
+++ b/Singular/Minor.cc
@@ -1,4 +1,4 @@
-#include <kernel/mod2.h>
-+#include "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..de7380f 100644
+index 50ceae8..8d2a1c4 100644
--- a/Singular/MinorInterface.cc
+++ b/Singular/MinorInterface.cc
@@ -1,4 +1,4 @@
-#include <kernel/mod2.h>
-+#include "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..2476bc4 100644
+index 1c08156..6ff81aa 100644
--- a/Singular/MinorProcessor.cc
+++ b/Singular/MinorProcessor.cc
@@ -1,4 +1,4 @@
-#include <kernel/mod2.h>
-+#include "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..7279d93 100644
+index 570f4e2..8d9e38b 100644
--- a/Singular/attrib.cc
+++ b/Singular/attrib.cc
@@ -13,7 +13,7 @@
@@ -240,76 +240,23 @@ index 570f4e2..7279d93 100644
#include <unistd.h>
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/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
+index bf80b3c..1e889dd 100644
--- a/Singular/calcSVD.cc
+++ b/Singular/calcSVD.cc
@@ -1,5 +1,5 @@
#include <stdio.h>
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_SVD
diff --git a/Singular/claptmpl.cc b/Singular/claptmpl.cc
-index 1038422..6d78421 100644
+index 1038422..6b33638 100644
--- a/Singular/claptmpl.cc
+++ b/Singular/claptmpl.cc
@@ -7,7 +7,7 @@
@@ -317,12 +264,12 @@ index 1038422..6d78421 100644
*/
-#include <kernel/mod2.h>
-+#include "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..a947f6f 100644
+index c327a19..5d0a81f 100644
--- a/Singular/cntrlc.cc
+++ b/Singular/cntrlc.cc
@@ -17,7 +17,7 @@
@@ -330,22 +277,34 @@ index c327a19..a947f6f 100644
#include <sys/types.h>
#include <sys/wait.h>
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/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/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..ef07f0b 100644
+index 8a69599..7ae982d 100644
--- a/Singular/eigenval_ip.cc
+++ b/Singular/eigenval_ip.cc
@@ -6,7 +6,7 @@
@@ -353,12 +312,12 @@ index 8a69599..ef07f0b 100644
*/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_EIGENVAL
diff --git a/Singular/emacs.cc b/Singular/emacs.cc
-index ced2f19..f7c15c1 100644
+index ced2f19..19e2f43 100644
--- a/Singular/emacs.cc
+++ b/Singular/emacs.cc
@@ -18,7 +18,7 @@
@@ -366,12 +325,12 @@ index ced2f19..f7c15c1 100644
#include <windows.h>
#endif
-#include <kernel/mod2.h>
-+#include "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..fc14156 100644
+index 9a8f021..47ec69b 100644
--- a/Singular/extra.cc
+++ b/Singular/extra.cc
@@ -12,7 +12,7 @@
@@ -379,12 +338,12 @@ index 9a8f021..fc14156 100644
#include <ctype.h>
#include <signal.h>
-#include <kernel/mod2.h>
-+#include "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..614304f 100644
+index 2421ba0..17308fa 100644
--- a/Singular/feOpt.cc
+++ b/Singular/feOpt.cc
@@ -8,7 +8,7 @@
@@ -392,12 +351,12 @@ index 2421ba0..614304f 100644
#include <string.h>
#include <stdlib.h>
-#include <kernel/mod2.h>
-+#include "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..299bfe2 100644
+index 34a0ffb..22a6781 100644
--- a/Singular/fehelp.cc
+++ b/Singular/fehelp.cc
@@ -13,7 +13,7 @@
@@ -405,12 +364,12 @@ index 34a0ffb..299bfe2 100644
#include <time.h>
-#include <kernel/mod2.h>
-+#include "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..fb26676 100644
+index 41b489b..71f4cb3 100644
--- a/Singular/fglm.cc
+++ b/Singular/fglm.cc
@@ -16,7 +16,7 @@
@@ -418,38 +377,12 @@ index 41b489b..fb26676 100644
*/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/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
+index 7e7880e..1b19df4 100644
--- a/Singular/gms.cc
+++ b/Singular/gms.cc
@@ -6,7 +6,7 @@
@@ -457,12 +390,12 @@ index 7e7880e..4e847fb 100644
*/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_GMS
diff --git a/Singular/grammar.cc b/Singular/grammar.cc
-index 72ca79a..3a14b40 100644
+index 72ca79a..7caf741 100644
--- a/Singular/grammar.cc
+++ b/Singular/grammar.cc
@@ -319,7 +319,7 @@
@@ -470,12 +403,12 @@ index 72ca79a..3a14b40 100644
#include <string.h>
-#include <kernel/mod2.h>
-+#include "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..523a078 100644
+index e3cfc5b..afc979a 100644
--- a/Singular/grammar.y
+++ b/Singular/grammar.y
@@ -12,7 +12,7 @@
@@ -483,12 +416,12 @@ index e3cfc5b..523a078 100644
#include <string.h>
-#include <kernel/mod2.h>
-+#include "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..e8e21be 100644
+index c93edd7..5716d4a 100644
--- a/Singular/interpolation.cc
+++ b/Singular/interpolation.cc
@@ -3,7 +3,7 @@
@@ -496,12 +429,12 @@ index c93edd7..e8e21be 100644
/* $Id: interpolation.cc 14320 2011-07-04 14:48:27Z hannes $ */
-#include <kernel/mod2.h>
-+#include "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..33acfac 100644
+index 884d724..fd51f29 100644
--- a/Singular/iparith.cc
+++ b/Singular/iparith.cc
@@ -12,7 +12,7 @@
@@ -509,12 +442,12 @@ index 884d724..33acfac 100644
#include <unistd.h>
-#include <kernel/mod2.h>
-+#include "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..9d48e35 100644
+index 76d25d3..9a0b0ac 100644
--- a/Singular/ipassign.cc
+++ b/Singular/ipassign.cc
@@ -12,7 +12,7 @@
@@ -522,12 +455,12 @@ index 76d25d3..9d48e35 100644
#include <ctype.h>
-#include <kernel/mod2.h>
-+#include "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..03c0677 100644
+index 202ddf1..0c8e1b5 100644
--- a/Singular/ipconv.cc
+++ b/Singular/ipconv.cc
@@ -6,7 +6,7 @@
@@ -535,12 +468,12 @@ index 202ddf1..03c0677 100644
*/
-#include <kernel/mod2.h>
-+#include "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..71ffb2a 100644
+index a989211..c36198c 100644
--- a/Singular/ipid.cc
+++ b/Singular/ipid.cc
@@ -7,7 +7,7 @@
@@ -548,12 +481,12 @@ index a989211..71ffb2a 100644
#include <string.h>
-#include <kernel/mod2.h>
-+#include "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..60843c4 100644
+index bccbc4c..821e92a 100644
--- a/Singular/iplib.cc
+++ b/Singular/iplib.cc
@@ -11,7 +11,7 @@
@@ -561,12 +494,12 @@ index bccbc4c..60843c4 100644
#include <sys/stat.h>
-#include <kernel/mod2.h>
-+#include "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..7f003ce 100644
+index 6adf3a1..16a05d8 100644
--- a/Singular/ipprint.cc
+++ b/Singular/ipprint.cc
@@ -6,7 +6,7 @@
@@ -574,12 +507,12 @@ index 6adf3a1..7f003ce 100644
*/
-#include <kernel/mod2.h>
-+#include "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..eae1998 100644
+index c4553fc..2aec463 100644
--- a/Singular/ipshell.cc
+++ b/Singular/ipshell.cc
@@ -11,7 +11,7 @@
@@ -587,12 +520,12 @@ index c4553fc..eae1998 100644
#include <math.h>
-#include <kernel/mod2.h>
-+#include "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..7d8f160 100755
+index d381a46..a0d24ba 100755
--- a/Singular/janet.cc
+++ b/Singular/janet.cc
@@ -3,7 +3,7 @@
@@ -600,23 +533,10 @@ index d381a46..7d8f160 100755
#include <time.h>
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/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
@@ -630,21 +550,8 @@ index c69af26..c85079b 100644
#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
+index d66f29d..d043fca 100644
--- a/Singular/lists.cc
+++ b/Singular/lists.cc
@@ -8,7 +8,7 @@
@@ -652,25 +559,12 @@ index d66f29d..e9500f2 100644
#define LISTS_CC
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/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
+index c74e8fd..cf34eaa 100644
--- a/Singular/maps_ip.cc
+++ b/Singular/maps_ip.cc
@@ -6,7 +6,7 @@
@@ -678,12 +572,12 @@ index c74e8fd..8e2e7ec 100644
*/
-#include <kernel/mod2.h>
-+#include "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..569022a 100644
+index c081a54..8538700 100644
--- a/Singular/minpoly.cc
+++ b/Singular/minpoly.cc
@@ -5,7 +5,7 @@
@@ -691,12 +585,12 @@ index c081a54..569022a 100644
#include<cmath>
-#include<Singular/mod2.h>
-+#include "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..41ad54d 100644
+index 43c1629..99de664 100644
--- a/Singular/misc_ip.cc
+++ b/Singular/misc_ip.cc
@@ -14,7 +14,7 @@
@@ -704,12 +598,12 @@ index 43c1629..41ad54d 100644
// include header files
-#include <kernel/mod2.h>
-+#include "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..6794379 100644
+index be4b923..0d1142f 100644
--- a/Singular/mpsr_Error.cc
+++ b/Singular/mpsr_Error.cc
@@ -12,7 +12,7 @@
@@ -717,12 +611,12 @@ index be4b923..6794379 100644
*
***************************************************************/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_MPSR
diff --git a/Singular/mpsr_Get.cc b/Singular/mpsr_Get.cc
-index 6708165..19e2a99 100644
+index 6708165..e305e34 100644
--- a/Singular/mpsr_Get.cc
+++ b/Singular/mpsr_Get.cc
@@ -13,7 +13,7 @@
@@ -730,12 +624,12 @@ index 6708165..19e2a99 100644
***************************************************************/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_MPSR
diff --git a/Singular/mpsr_GetMisc.cc b/Singular/mpsr_GetMisc.cc
-index fda7ac3..83e34b7 100644
+index fda7ac3..457b01e 100644
--- a/Singular/mpsr_GetMisc.cc
+++ b/Singular/mpsr_GetMisc.cc
@@ -13,7 +13,7 @@
@@ -743,12 +637,12 @@ index fda7ac3..83e34b7 100644
***************************************************************/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_MPSR
diff --git a/Singular/mpsr_GetPoly.cc b/Singular/mpsr_GetPoly.cc
-index de57603..3b685d7 100644
+index de57603..4d885ee 100644
--- a/Singular/mpsr_GetPoly.cc
+++ b/Singular/mpsr_GetPoly.cc
@@ -12,7 +12,7 @@
@@ -756,12 +650,12 @@ index de57603..3b685d7 100644
*
***************************************************************/
-#include <kernel/mod2.h>
-+#include "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..1aa5e5b 100644
+index ca868a5..46c336f 100644
--- a/Singular/mpsr_Put.cc
+++ b/Singular/mpsr_Put.cc
@@ -14,7 +14,7 @@
@@ -769,12 +663,12 @@ index ca868a5..1aa5e5b 100644
*
***************************************************************/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_MPSR
diff --git a/Singular/mpsr_PutPoly.cc b/Singular/mpsr_PutPoly.cc
-index 51c67de..9eea2f8 100644
+index 51c67de..7c19889 100644
--- a/Singular/mpsr_PutPoly.cc
+++ b/Singular/mpsr_PutPoly.cc
@@ -15,7 +15,7 @@
@@ -782,12 +676,12 @@ index 51c67de..9eea2f8 100644
*
***************************************************************/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_MPSR
diff --git a/Singular/mpsr_Tok.cc b/Singular/mpsr_Tok.cc
-index 8d8873c..b0b5c85 100644
+index 8d8873c..a006d79 100644
--- a/Singular/mpsr_Tok.cc
+++ b/Singular/mpsr_Tok.cc
@@ -18,7 +18,7 @@
@@ -795,12 +689,12 @@ index 8d8873c..b0b5c85 100644
#include <unistd.h>
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_MPSR
diff --git a/Singular/mpsr_sl.cc b/Singular/mpsr_sl.cc
-index 39224f3..350933f 100644
+index 39224f3..84f0db2 100644
--- a/Singular/mpsr_sl.cc
+++ b/Singular/mpsr_sl.cc
@@ -9,7 +9,7 @@
@@ -808,12 +702,12 @@ index 39224f3..350933f 100644
*******************************************************************/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_MPSR
diff --git a/Singular/ndbm.cc b/Singular/ndbm.cc
-index c6f4e11..ee64797 100644
+index c6f4e11..f67fe34 100644
--- a/Singular/ndbm.cc
+++ b/Singular/ndbm.cc
@@ -14,7 +14,7 @@
@@ -821,24 +715,12 @@ index c6f4e11..ee64797 100644
//**************************************************************************/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/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
+index de543be..d463a09 100644
--- a/Singular/pcv.cc
+++ b/Singular/pcv.cc
@@ -6,7 +6,7 @@
@@ -846,38 +728,25 @@ index de543be..a9be056 100644
*/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/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"
+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 <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"
+-#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..a3fba9b 100644
+index bbe8eea..16cbbfc 100644
--- a/Singular/scanner.cc
+++ b/Singular/scanner.cc
@@ -561,7 +561,7 @@ char *yytext;
@@ -885,7 +754,7 @@ index bbe8eea..a3fba9b 100644
#include <ctype.h>
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#include <omalloc/omalloc.h>
#include <Singular/tok.h>
#include <Singular/stype.h>
@@ -903,7 +772,7 @@ index 384072b..aad2f7f 100644
#include <Singular/tok.h>
#include <Singular/stype.h>
diff --git a/Singular/sdb.cc b/Singular/sdb.cc
-index 7460449..dfdacf4 100644
+index 7460449..300bea0 100644
--- a/Singular/sdb.cc
+++ b/Singular/sdb.cc
@@ -8,7 +8,7 @@
@@ -911,12 +780,12 @@ index 7460449..dfdacf4 100644
#include <unistd.h> // for unlink,fork,execlp,getpid
#include <sys/wait.h> // for wait
-#include <kernel/mod2.h>
-+#include "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..5c292b2 100644
+index 90c11da..a96b7e3 100644
--- a/Singular/silink.cc
+++ b/Singular/silink.cc
@@ -13,7 +13,7 @@
@@ -924,12 +793,12 @@ index 90c11da..5c292b2 100644
#include <unistd.h>
-#include <kernel/mod2.h>
-+#include "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..e3ed834 100644
+index cb84bb2..2fb06c7 100644
--- a/Singular/sing_dbm.cc
+++ b/Singular/sing_dbm.cc
@@ -16,7 +16,7 @@
@@ -937,12 +806,12 @@ index cb84bb2..e3ed834 100644
# include <errno.h>
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_DBM
diff --git a/Singular/sing_win.cc b/Singular/sing_win.cc
-index b2fc5ea..e569c14 100644
+index b2fc5ea..a961016 100644
--- a/Singular/sing_win.cc
+++ b/Singular/sing_win.cc
@@ -7,7 +7,7 @@
@@ -950,12 +819,12 @@ index b2fc5ea..e569c14 100644
*/
-#include <kernel/mod2.h>
-+#include "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..bfaa5a8 100644
+index f93653e..8c179ee 100644
--- a/Singular/slInit_Dynamic.cc
+++ b/Singular/slInit_Dynamic.cc
@@ -14,7 +14,7 @@
@@ -963,12 +832,12 @@ index f93653e..bfaa5a8 100644
*
***************************************************************/
-#include <kernel/mod2.h>
-+#include "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..169b2f9 100644
+index ffe3eed..fef9eac 100644
--- a/Singular/slInit_Static.cc
+++ b/Singular/slInit_Static.cc
@@ -14,7 +14,7 @@
@@ -976,12 +845,12 @@ index ffe3eed..169b2f9 100644
*
***************************************************************/
-#include <kernel/mod2.h>
-+#include "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..825eb21 100644
+index 0705a7d..f216dc8 100644
--- a/Singular/ssiLink.cc
+++ b/Singular/ssiLink.cc
@@ -22,7 +22,7 @@
@@ -989,12 +858,12 @@ index 0705a7d..825eb21 100644
-#include <kernel/mod2.h>
-+#include "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..cdcf5b5 100644
+index bba1b6d..1f63592 100644
--- a/Singular/subexpr.cc
+++ b/Singular/subexpr.cc
@@ -11,7 +11,7 @@
@@ -1002,12 +871,12 @@ index bba1b6d..cdcf5b5 100644
#include <unistd.h>
-#include <kernel/mod2.h>
-+#include "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..3f9f392 100644
+index 475d942..10e9cc0 100644
--- a/Singular/tesths.cc
+++ b/Singular/tesths.cc
@@ -14,7 +14,7 @@
@@ -1015,12 +884,12 @@ index 475d942..3f9f392 100644
#include <time.h>
#include <errno.h>
-#include <kernel/mod2.h>
-+#include "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..f06797e 100644
+index 34ba272..f4bc159 100644
--- a/Singular/walk.cc
+++ b/Singular/walk.cc
@@ -46,7 +46,7 @@
@@ -1028,12 +897,12 @@ index 34ba272..f06797e 100644
-#include <kernel/mod2.h>
-+#include "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..a1e42d7 100644
+index a315433..01a58a4 100644
--- a/Singular/walk_ip.cc
+++ b/Singular/walk_ip.cc
@@ -12,7 +12,7 @@
@@ -1041,33 +910,33 @@ index a315433..a1e42d7 100644
#include <math.h>
-#include <kernel/mod2.h>
-+#include "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..da1a393 100755
+index 07a2e2f..7884e9f 100755
--- a/Singular/wrapper.cc
+++ b/Singular/wrapper.cc
@@ -1,5 +1,5 @@
#include <string.h>
-#include <kernel/mod2.h>
-+#include "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..2d02c7b 100644
+index 3e56e0b..22c7699 100644
--- a/kernel/F4.cc
+++ b/kernel/F4.cc
@@ -1,4 +1,4 @@
-#include <kernel/mod2.h>
-+#include "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..a8c731d 100644
+index be2021a..384ebc9 100644
--- a/kernel/F5cData.cc
+++ b/kernel/F5cData.cc
@@ -9,7 +9,7 @@
@@ -1075,22 +944,22 @@ index be2021a..a8c731d 100644
*/
-#include <kernel/mod2.h>
-+#include "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..2a90e87 100644
+index daab9db..8922036 100644
--- a/kernel/F5cLists.cc
+++ b/kernel/F5cLists.cc
@@ -1,4 +1,4 @@
-#include <kernel/mod2.h>
-+#include "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..406604f 100644
+index 8d73221..628d90d 100644
--- a/kernel/GMPrat.cc
+++ b/kernel/GMPrat.cc
@@ -8,7 +8,7 @@
@@ -1098,12 +967,12 @@ index 8d73221..406604f 100644
#define GMPRAT_CC
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_SPECTRUM
diff --git a/kernel/Number.h b/kernel/Number.h
-index 4428d15..e46b9aa 100644
+index 4428d15..05f52b7 100644
--- a/kernel/Number.h
+++ b/kernel/Number.h
@@ -1,7 +1,7 @@
@@ -1111,12 +980,12 @@ index 4428d15..e46b9aa 100644
#define NUMBERCPP_HEADER
#include <boost/intrusive_ptr.hpp>
-#include <kernel/mod2.h>
-+#include "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..08b8ea1 100644
+index 481e96a..d95614b 100644
--- a/kernel/Poly.h
+++ b/kernel/Poly.h
@@ -4,7 +4,7 @@
@@ -1124,24 +993,24 @@ index 481e96a..08b8ea1 100644
#ifndef POLYCPP_HEADER
#define POLYCPP_HEADER
-#include <kernel/mod2.h>
-+#include "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..3e3a169 100644
+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 "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..50d0b8c 100644
+index a043330..3cf1386 100644
--- a/kernel/clapconv.cc
+++ b/kernel/clapconv.cc
@@ -8,7 +8,7 @@
@@ -1149,12 +1018,12 @@ index a043330..50d0b8c 100644
-#include <kernel/mod2.h>
-+#include "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..0ddc961 100644
+index 2159b6a..e822a0a 100644
--- a/kernel/clapsing.cc
+++ b/kernel/clapsing.cc
@@ -8,7 +8,7 @@
@@ -1162,12 +1031,12 @@ index 2159b6a..0ddc961 100644
//#define FACTORIZE2_DEBUG
-#include <kernel/mod2.h>
-+#include "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..648876b 100644
+index 61a5076..18c9ec4 100644
--- a/kernel/dError.c
+++ b/kernel/dError.c
@@ -12,7 +12,7 @@
@@ -1175,12 +1044,12 @@ index 61a5076..648876b 100644
#include <stdarg.h>
#include <stdio.h>
-#include <kernel/mod2.h>
-+#include "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..9e4ad58 100644
+index 89f6a44..a03ccdf 100644
--- a/kernel/digitech.cc
+++ b/kernel/digitech.cc
@@ -2,7 +2,7 @@
@@ -1188,24 +1057,24 @@ index 89f6a44..9e4ad58 100644
****************************************/
/* $Id: digitech.cc 13628 2010-11-10 16:07:34Z hannes $ */
-#include <kernel/mod2.h>
-+#include "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..1d37d17 100644
+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 "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..356d8f2 100644
+index c2dad58..2c4d628 100644
--- a/kernel/eigenval.cc
+++ b/kernel/eigenval.cc
@@ -6,7 +6,7 @@
@@ -1213,22 +1082,22 @@ index c2dad58..356d8f2 100644
*/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_EIGENVAL
diff --git a/kernel/f5c.cc b/kernel/f5c.cc
-index c1e3b33..4f175fc 100644
+index c1e3b33..caebac9 100644
--- a/kernel/f5c.cc
+++ b/kernel/f5c.cc
@@ -1,4 +1,4 @@
-#include <kernel/mod2.h>
-+#include "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..50cc200 100644
+index d5c716a..7033b45 100644
--- a/kernel/f5data.cc
+++ b/kernel/f5data.cc
@@ -6,7 +6,7 @@
@@ -1236,12 +1105,12 @@ index d5c716a..50cc200 100644
* ABSTRACT: lpolynomial definition
*/
-#include <kernel/mod2.h>
-+#include "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..9a735b3 100644
+index d308517..72b20d0 100644
--- a/kernel/f5gb.cc
+++ b/kernel/f5gb.cc
@@ -5,7 +5,7 @@
@@ -1249,22 +1118,22 @@ index d308517..9a735b3 100644
*/
-#include <kernel/mod2.h>
-+#include "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..f60e725 100644
+index ae0bcab..4546a17 100644
--- a/kernel/f5lists.cc
+++ b/kernel/f5lists.cc
@@ -1,4 +1,4 @@
-#include <kernel/mod2.h>
-+#include "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..ff28211 100644
+index 4866aed..205abb3 100644
--- a/kernel/fast_maps.cc
+++ b/kernel/fast_maps.cc
@@ -8,7 +8,7 @@
@@ -1272,12 +1141,12 @@ index 4866aed..ff28211 100644
* Version: $Id: fast_maps.cc 13210 2010-09-17 13:36:19Z seelisch $
*******************************************************************/
-#include <kernel/mod2.h>
-+#include "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..3128729 100644
+index 95b40c4..39f12c4 100644
--- a/kernel/fast_mult.cc
+++ b/kernel/fast_mult.cc
@@ -2,7 +2,7 @@
@@ -1285,24 +1154,24 @@ index 95b40c4..3128729 100644
****************************************/
/* $Id: fast_mult.cc 14278 2011-06-14 13:49:47Z hannes $ */
-#include <kernel/mod2.h>
-+#include "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..87f1d2b 100644
+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 "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 de6cb29..a4dc70e 100644
+index 5633f3a..5a32d3a 100644
--- a/kernel/feResource.cc
+++ b/kernel/feResource.cc
@@ -10,7 +10,7 @@
@@ -1310,12 +1179,12 @@ index de6cb29..a4dc70e 100644
#include <string.h>
-#include <kernel/mod2.h>
-+#include "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..e6ca370 100644
+index b8a7789..6d1bbd4 100644
--- a/kernel/febase.cc
+++ b/kernel/febase.cc
@@ -8,7 +8,7 @@
@@ -1323,12 +1192,12 @@ index b8a7789..e6ca370 100644
/* I need myfread in standalone_parser */
#ifndef STANDALONE_PARSER
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/kernel/fegetopt.c b/kernel/fegetopt.c
-index 6bac789..3a55225 100644
+index 6bac789..bf312ee 100644
--- a/kernel/fegetopt.c
+++ b/kernel/fegetopt.c
@@ -32,7 +32,7 @@
@@ -1336,12 +1205,12 @@ index 6bac789..3a55225 100644
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifndef __STDC__
# ifndef const
diff --git a/kernel/feread.cc b/kernel/feread.cc
-index a77285b..c9b20ee 100644
+index a77285b..f3e7f12 100644
--- a/kernel/feread.cc
+++ b/kernel/feread.cc
@@ -6,7 +6,7 @@
@@ -1349,12 +1218,12 @@ index a77285b..c9b20ee 100644
*/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
// ----------------------------------------
// system settings:
diff --git a/kernel/fereadl.c b/kernel/fereadl.c
-index 9f3407b..8dea4cb 100644
+index 9f3407b..21873b8 100644
--- a/kernel/fereadl.c
+++ b/kernel/fereadl.c
@@ -7,7 +7,7 @@
@@ -1362,12 +1231,12 @@ index 9f3407b..8dea4cb 100644
-#include <kernel/mod2.h>
-+#include "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..2468e0c 100644
+index 91ed4e3..c1143c8 100644
--- a/kernel/ffields.cc
+++ b/kernel/ffields.cc
@@ -7,7 +7,7 @@
@@ -1375,12 +1244,12 @@ index 91ed4e3..2468e0c 100644
#include <string.h>
-#include <kernel/mod2.h>
-+#include "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..a1dd77e 100644
+index 3d3eaa1..d19eead 100644
--- a/kernel/fglmcomb.cc
+++ b/kernel/fglmcomb.cc
@@ -8,7 +8,7 @@
@@ -1388,12 +1257,12 @@ index 3d3eaa1..a1dd77e 100644
*/
-#include <kernel/mod2.h>
-+#include "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..d2f2135 100644
+index 5764597..d3b3ee4 100644
--- a/kernel/fglmgauss.cc
+++ b/kernel/fglmgauss.cc
@@ -9,7 +9,7 @@
@@ -1401,12 +1270,12 @@ index 5764597..d2f2135 100644
*/
-#include <kernel/mod2.h>
-+#include "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..96e270e 100644
+index 468dc2c..61219da 100644
--- a/kernel/fglmhom.cc
+++ b/kernel/fglmhom.cc
@@ -10,7 +10,7 @@
@@ -1414,12 +1283,12 @@ index 468dc2c..96e270e 100644
-#include <kernel/mod2.h>
-+#include "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..6560a5e 100644
+index b9f90da..c2d8579 100644
--- a/kernel/fglmvec.cc
+++ b/kernel/fglmvec.cc
@@ -12,7 +12,7 @@
@@ -1427,12 +1296,12 @@ index b9f90da..6560a5e 100644
*/
-#include <kernel/mod2.h>
-+#include "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..3f86f55 100644
+index e9d3dae..b3bd181 100644
--- a/kernel/fglmzero.cc
+++ b/kernel/fglmzero.cc
@@ -18,7 +18,7 @@
@@ -1440,12 +1309,12 @@ index e9d3dae..3f86f55 100644
*/
-#include <kernel/mod2.h>
-+#include "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..86ab02b 100644
+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
@@ -1453,12 +1322,12 @@ index ca08a3c..86ab02b 100644
*/
-#include <kernel/mod2.h>
-+#include "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..eec7adb 100644
+index da6d51c..e20b0ab 100644
--- a/kernel/gnumpc.cc
+++ b/kernel/gnumpc.cc
@@ -8,7 +8,7 @@
@@ -1466,12 +1335,12 @@ index da6d51c..eec7adb 100644
*/
-#include <kernel/mod2.h>
-+#include "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..fd67c96 100644
+index 4d49b11..c3d7c5c 100644
--- a/kernel/gnumpfl.cc
+++ b/kernel/gnumpfl.cc
@@ -8,7 +8,7 @@
@@ -1479,12 +1348,12 @@ index 4d49b11..fd67c96 100644
*/
-#include <kernel/mod2.h>
-+#include "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..feb30b3 100644
+index dc014e8..1fe8521 100644
--- a/kernel/gr_kstd2.cc
+++ b/kernel/gr_kstd2.cc
@@ -6,7 +6,7 @@
@@ -1492,12 +1361,12 @@ index dc014e8..feb30b3 100644
*/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_PLURAL
diff --git a/kernel/gring.cc b/kernel/gring.cc
-index 5abd2cb..6f46995 100644
+index 5abd2cb..1feb027 100644
--- a/kernel/gring.cc
+++ b/kernel/gring.cc
@@ -17,7 +17,7 @@
@@ -1505,12 +1374,12 @@ index 5abd2cb..6f46995 100644
#endif
-#include <kernel/mod2.h>
-+#include "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..0675787 100644
+index 4706f5b..df561e6 100644
--- a/kernel/hdegree.cc
+++ b/kernel/hdegree.cc
@@ -6,7 +6,7 @@
@@ -1518,12 +1387,12 @@ index 4706f5b..0675787 100644
*/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#include <kernel/structs.h>
diff --git a/kernel/hilb.cc b/kernel/hilb.cc
-index 64abe8a..83ee997 100644
+index 64abe8a..e38b0f4 100644
--- a/kernel/hilb.cc
+++ b/kernel/hilb.cc
@@ -6,7 +6,7 @@
@@ -1531,12 +1400,12 @@ index 64abe8a..83ee997 100644
*/
-#include <kernel/mod2.h>
-+#include "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..9bd989b 100644
+index 4e76eb7..62788b1 100644
--- a/kernel/hutil.cc
+++ b/kernel/hutil.cc
@@ -6,7 +6,7 @@
@@ -1544,12 +1413,12 @@ index 4e76eb7..9bd989b 100644
*/
-#include <kernel/mod2.h>
-+#include "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..0c6c2a2 100644
+index 8d8f8f6..d68e749 100644
--- a/kernel/ideals.cc
+++ b/kernel/ideals.cc
@@ -7,7 +7,7 @@
@@ -1557,12 +1426,12 @@ index 8d8f8f6..0c6c2a2 100644
/* includes */
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifndef NDEBUG
# define MYTEST 0
diff --git a/kernel/int64vec.cc b/kernel/int64vec.cc
-index 4937c7a..123362b 100644
+index 4937c7a..2b76231 100644
--- a/kernel/int64vec.cc
+++ b/kernel/int64vec.cc
@@ -5,7 +5,7 @@
@@ -1570,12 +1439,12 @@ index 4937c7a..123362b 100644
* ABSTRACT: class int64vec: lists/vectors of int64
*/
-#include <kernel/mod2.h>
-+#include "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..4f9f5f7 100644
+index 95b1fa4..a734f88 100644
--- a/kernel/intvec.cc
+++ b/kernel/intvec.cc
@@ -7,7 +7,7 @@
@@ -1583,12 +1452,12 @@ index 95b1fa4..4f9f5f7 100644
#ifndef INTVEC_CC
#define INTVEC_CC
-#include <kernel/mod2.h>
-+#include "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..57937e1 100644
+index 0c6f388..0826e8e 100644
--- a/kernel/kbuckets.cc
+++ b/kernel/kbuckets.cc
@@ -3,7 +3,7 @@
@@ -1596,12 +1465,12 @@ index 0c6f388..57937e1 100644
/* $Id: kbuckets.cc 14278 2011-06-14 13:49:47Z hannes $ */
-#include <kernel/mod2.h>
-+#include "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..b31f13d 100644
+index 421afdc..1a2aa5f 100644
--- a/kernel/khstd.cc
+++ b/kernel/khstd.cc
@@ -6,7 +6,7 @@
@@ -1609,12 +1478,12 @@ index 421afdc..b31f13d 100644
*/
-#include <kernel/mod2.h>
-+#include "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..814c408 100644
+index 6288e4a..0cbe7d5 100644
--- a/kernel/kspoly.cc
+++ b/kernel/kspoly.cc
@@ -7,7 +7,7 @@
@@ -1622,12 +1491,12 @@ index 6288e4a..814c408 100644
// #define PDEBUG 2
-#include <kernel/mod2.h>
-+#include "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..0f059cb 100644
+index 1c10f05..690a9f9 100644
--- a/kernel/kstd1.cc
+++ b/kernel/kstd1.cc
@@ -14,7 +14,7 @@
@@ -1635,12 +1504,12 @@ index 1c10f05..0f059cb 100644
#define MORA_USE_BUCKETS
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#include <omalloc/omalloc.h>
#ifndef NDEBUG
diff --git a/kernel/kstd2.cc b/kernel/kstd2.cc
-index 663fc1d..8af3655 100644
+index 663fc1d..b064a59 100644
--- a/kernel/kstd2.cc
+++ b/kernel/kstd2.cc
@@ -13,7 +13,7 @@
@@ -1648,12 +1517,12 @@ index 663fc1d..8af3655 100644
#define HAVE_TAIL_RING
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifndef NDEBUG
# define MYTEST 0
diff --git a/kernel/kstdfac.cc b/kernel/kstdfac.cc
-index 6d598e3..9205e65 100644
+index 6d598e3..10c4800 100644
--- a/kernel/kstdfac.cc
+++ b/kernel/kstdfac.cc
@@ -6,7 +6,7 @@
@@ -1661,12 +1530,12 @@ index 6d598e3..9205e65 100644
*/
-#include <kernel/mod2.h>
-+#include "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..06537b9 100644
+index 2b10ea5..a464baf 100644
--- a/kernel/kutil.cc
+++ b/kernel/kutil.cc
@@ -10,7 +10,7 @@
@@ -1674,12 +1543,12 @@ index 2b10ea5..06537b9 100644
#include <stdlib.h>
#include <string.h>
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifndef NDEBUG
# define MYTEST 0
diff --git a/kernel/linearAlgebra.cc b/kernel/linearAlgebra.cc
-index a06d10e..8658a24 100644
+index a06d10e..e3f22a7 100644
--- a/kernel/linearAlgebra.cc
+++ b/kernel/linearAlgebra.cc
@@ -16,7 +16,7 @@
@@ -1687,12 +1556,12 @@ index a06d10e..8658a24 100644
// include header files
-#include <kernel/mod2.h>
-+#include "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..e1421bf 100644
+index 730d8a1..2e179b7 100644
--- a/kernel/longalg.cc
+++ b/kernel/longalg.cc
@@ -7,7 +7,7 @@
@@ -1700,12 +1569,12 @@ index 730d8a1..e1421bf 100644
#include <stdio.h>
#include <string.h>
-#include <kernel/mod2.h>
-+#include "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..50165db 100644
+index bf7614e..4370f46 100644
--- a/kernel/longrat.cc
+++ b/kernel/longrat.cc
@@ -6,7 +6,7 @@
@@ -1713,12 +1582,12 @@ index bf7614e..50165db 100644
*/
-#include <kernel/mod2.h>
-+#include "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..61b49e6 100644
+index a550a2e..ee9b596 100644
--- a/kernel/longrat0.cc
+++ b/kernel/longrat0.cc
@@ -9,7 +9,7 @@
@@ -1726,12 +1595,12 @@ index a550a2e..61b49e6 100644
#include <stdio.h>
#include <string.h>
-#include <kernel/mod2.h>
-+#include "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..5786683 100644
+index cf2ebef..88d48ab 100644
--- a/kernel/longtrans.cc
+++ b/kernel/longtrans.cc
@@ -9,7 +9,7 @@
@@ -1739,12 +1608,12 @@ index cf2ebef..5786683 100644
#include <stdio.h>
#include <string.h>
-#include <kernel/mod2.h>
-+#include "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..2a02b32 100644
+index cd41992..12151e9 100644
--- a/kernel/lplist.cc
+++ b/kernel/lplist.cc
@@ -5,7 +5,7 @@
@@ -1752,12 +1621,12 @@ index cd41992..2a02b32 100644
* ABSTRACT: list interface
*/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_F5
diff --git a/kernel/maps.cc b/kernel/maps.cc
-index c1b5023..6e03cc7 100644
+index c1b5023..fa6cc80 100644
--- a/kernel/maps.cc
+++ b/kernel/maps.cc
@@ -6,7 +6,7 @@
@@ -1765,12 +1634,12 @@ index c1b5023..6e03cc7 100644
*/
-#include <kernel/mod2.h>
-+#include "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..47a746a 100644
+index 5e5147f..0d9c215 100644
--- a/kernel/matpol.cc
+++ b/kernel/matpol.cc
@@ -10,7 +10,7 @@
@@ -1778,12 +1647,12 @@ index 5e5147f..47a746a 100644
#include <math.h>
-#include <kernel/mod2.h>
-+#include "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..910db8b 100644
+index 4ba410c..21ecce5 100644
--- a/kernel/misc.cc
+++ b/kernel/misc.cc
@@ -12,7 +12,7 @@
@@ -1791,12 +1660,12 @@ index 4ba410c..910db8b 100644
#include <time.h>
-#include <kernel/mod2.h>
-+#include "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..47388ec 100644
+index 238d10d..6659b24 100644
--- a/kernel/mmalloc.cc
+++ b/kernel/mmalloc.cc
@@ -7,7 +7,7 @@
@@ -1804,12 +1673,12 @@ index 238d10d..47388ec 100644
#include <stdlib.h>
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#include <omalloc/omalloc.h>
#include <new>
diff --git a/kernel/mmstd.c b/kernel/mmstd.c
-index e3f144a..5614bd8 100644
+index e3f144a..80aeb53 100644
--- a/kernel/mmstd.c
+++ b/kernel/mmstd.c
@@ -7,7 +7,7 @@
@@ -1817,12 +1686,12 @@ index e3f144a..5614bd8 100644
*/
-#include <kernel/mod2.h>
-+#include "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..4c4d39a 100644
+index e388b82..4971140 100644
--- a/kernel/mod_raw.cc
+++ b/kernel/mod_raw.cc
@@ -17,7 +17,7 @@
@@ -1830,12 +1699,12 @@ index e388b82..4c4d39a 100644
-#include <kernel/mod2.h>
-+#include "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..3c46b8f 100644
+index 8b9089f..126d712 100644
--- a/kernel/modulop.cc
+++ b/kernel/modulop.cc
@@ -6,7 +6,7 @@
@@ -1843,12 +1712,12 @@ index 8b9089f..3c46b8f 100644
#include <string.h>
-#include <kernel/mod2.h>
-+#include "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..ce0fbaf 100644
+index e67757c..f1a50b9 100644
--- a/kernel/mpr_base.cc
+++ b/kernel/mpr_base.cc
@@ -8,7 +8,7 @@
@@ -1856,12 +1725,12 @@ index e67757c..ce0fbaf 100644
#include <math.h>
-#include <kernel/mod2.h>
-+#include "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..c62ce8e 100644
+index bea595f..b5427f9 100644
--- a/kernel/mpr_complex.cc
+++ b/kernel/mpr_complex.cc
@@ -11,7 +11,7 @@
@@ -1869,12 +1738,12 @@ index bea595f..c62ce8e 100644
// WARNING! ALWAYS use omAlloc and FreeL when alloc. memory for some char* !!
-#include <kernel/mod2.h>
-+#include "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..4e7df4f 100644
+index 6957432..3499fe4 100644
--- a/kernel/mpr_inout.cc
+++ b/kernel/mpr_inout.cc
@@ -8,7 +8,7 @@
@@ -1882,12 +1751,12 @@ index 6957432..4e7df4f 100644
*/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
//#ifdef HAVE_MPR
//-> includes
diff --git a/kernel/mpr_numeric.cc b/kernel/mpr_numeric.cc
-index bf2e87a..47a76f1 100644
+index bf2e87a..10e7bd9 100644
--- a/kernel/mpr_numeric.cc
+++ b/kernel/mpr_numeric.cc
@@ -9,7 +9,7 @@
@@ -1895,12 +1764,12 @@ index bf2e87a..47a76f1 100644
*/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
//#ifdef HAVE_MPR
//#define mprDEBUG_ALL
diff --git a/kernel/multicnt.cc b/kernel/multicnt.cc
-index 9f11b1d..0e46e2c 100644
+index 9f11b1d..de21ed3 100644
--- a/kernel/multicnt.cc
+++ b/kernel/multicnt.cc
@@ -7,7 +7,7 @@
@@ -1908,12 +1777,12 @@ index 9f11b1d..0e46e2c 100644
#define MULTICNT_CC
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_SPECTRUM
diff --git a/kernel/ncSACache.cc b/kernel/ncSACache.cc
-index 99eaeb5..2e1c902 100644
+index 99eaeb5..c8a23d2 100644
--- a/kernel/ncSACache.cc
+++ b/kernel/ncSACache.cc
@@ -18,7 +18,7 @@
@@ -1921,12 +1790,12 @@ index 99eaeb5..2e1c902 100644
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifndef NDEBUG
#define OUTPUT 1
diff --git a/kernel/ncSAFormula.cc b/kernel/ncSAFormula.cc
-index b5c6cef..590a81a 100644
+index b5c6cef..f26ddc3 100644
--- a/kernel/ncSAFormula.cc
+++ b/kernel/ncSAFormula.cc
@@ -18,7 +18,7 @@
@@ -1934,12 +1803,12 @@ index b5c6cef..590a81a 100644
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_PLURAL
diff --git a/kernel/ncSAMult.cc b/kernel/ncSAMult.cc
-index d562476..1ab004c 100644
+index d562476..80ae708 100644
--- a/kernel/ncSAMult.cc
+++ b/kernel/ncSAMult.cc
@@ -18,7 +18,7 @@
@@ -1947,12 +1816,12 @@ index d562476..1ab004c 100644
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_PLURAL
diff --git a/kernel/npolygon.cc b/kernel/npolygon.cc
-index afb939b..09c074f 100644
+index afb939b..b54d941 100644
--- a/kernel/npolygon.cc
+++ b/kernel/npolygon.cc
@@ -7,7 +7,7 @@
@@ -1960,12 +1829,12 @@ index afb939b..09c074f 100644
#define NPOLYGON_CC
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_SPECTRUM
diff --git a/kernel/numbers.cc b/kernel/numbers.cc
-index 73714de..18e14fc 100644
+index 73714de..fe59242 100644
--- a/kernel/numbers.cc
+++ b/kernel/numbers.cc
@@ -9,7 +9,7 @@
@@ -1973,12 +1842,12 @@ index 73714de..18e14fc 100644
#include <string.h>
#include <stdlib.h>
-#include <kernel/mod2.h>
-+#include "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..7014048 100644
+index 6ce992f..68bdfb1 100644
--- a/kernel/pDebug.cc
+++ b/kernel/pDebug.cc
@@ -15,7 +15,7 @@
@@ -1986,12 +1855,12 @@ index 6ce992f..7014048 100644
-#include <kernel/mod2.h>
-+#include "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..79e4cc0 100644
+index 4160627..73a9de7 100644
--- a/kernel/pInline0.cc
+++ b/kernel/pInline0.cc
@@ -10,7 +10,7 @@
@@ -1999,12 +1868,12 @@ index 4160627..79e4cc0 100644
#ifndef PINLINE0_CC
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#define PINLINE0_CC
#undef DO_PINLINE0
diff --git a/kernel/pInline1.cc b/kernel/pInline1.cc
-index 68bf114..df6d190 100644
+index 68bf114..a1ad691 100644
--- a/kernel/pInline1.cc
+++ b/kernel/pInline1.cc
@@ -11,7 +11,7 @@
@@ -2012,12 +1881,12 @@ index 68bf114..df6d190 100644
#define PINLINE1_CC
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef PDEBUG
diff --git a/kernel/pInline2.cc b/kernel/pInline2.cc
-index 5aafa5b..8aaac52 100644
+index 5aafa5b..c8229b4 100644
--- a/kernel/pInline2.cc
+++ b/kernel/pInline2.cc
@@ -10,7 +10,7 @@
@@ -2025,12 +1894,12 @@ index 5aafa5b..8aaac52 100644
#ifndef PINLINE2_CC
#define PINLINE2_CC
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef PDEBUG
diff --git a/kernel/pShallowCopyDelete.cc b/kernel/pShallowCopyDelete.cc
-index 3aef21c..f88233e 100644
+index 3aef21c..aa32ca7 100644
--- a/kernel/pShallowCopyDelete.cc
+++ b/kernel/pShallowCopyDelete.cc
@@ -8,7 +8,7 @@
@@ -2038,12 +1907,12 @@ index 3aef21c..f88233e 100644
* Version: $Id: pShallowCopyDelete.cc 13032 2010-07-17 20:38:50Z krueger $
*******************************************************************/
-#include <kernel/mod2.h>
-+#include "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..4edb63c 100644
+index a638570..35f2349 100644
--- a/kernel/p_Mult_q.cc
+++ b/kernel/p_Mult_q.cc
@@ -8,7 +8,7 @@
@@ -2051,12 +1920,12 @@ index a638570..4edb63c 100644
* Version: $Id: p_Mult_q.cc 13032 2010-07-17 20:38:50Z krueger $
*******************************************************************/
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
/***************************************************************
*
diff --git a/kernel/p_Mult_q.h b/kernel/p_Mult_q.h
-index 9000e51..1aded2f 100644
+index 9000e51..87f57ee 100644
--- a/kernel/p_Mult_q.h
+++ b/kernel/p_Mult_q.h
@@ -9,7 +9,7 @@
@@ -2064,12 +1933,12 @@ index 9000e51..1aded2f 100644
* Version: $Id: p_Mult_q.h 13032 2010-07-17 20:38:50Z krueger $
*******************************************************************/
-#include <kernel/mod2.h>
-+#include "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..e76be3b 100644
+index 9e8bd31..800c3d4 100644
--- a/kernel/p_Procs_Dynamic.cc
+++ b/kernel/p_Procs_Dynamic.cc
@@ -8,7 +8,7 @@
@@ -2077,12 +1946,12 @@ index 9e8bd31..e76be3b 100644
* Version: $Id: p_Procs_Dynamic.cc 13051 2010-07-22 14:33:35Z hannes $
*******************************************************************/
-#include <kernel/mod2.h>
-+#include "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..6c858b2 100644
+index 5733285..3b25bac 100644
--- a/kernel/p_Procs_Generate.cc
+++ b/kernel/p_Procs_Generate.cc
@@ -15,7 +15,7 @@
@@ -2090,12 +1959,12 @@ index 5733285..6c858b2 100644
#include <string.h>
-#include <kernel/mod2.h>
-+#include "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..72424c8 100644
+index 33a3b9f..28bcdfb 100644
--- a/kernel/p_Procs_Lib.cc
+++ b/kernel/p_Procs_Lib.cc
@@ -8,7 +8,7 @@
@@ -2103,12 +1972,12 @@ index 33a3b9f..72424c8 100644
* Version: $Id: p_Procs_Lib.cc 13052 2010-07-22 14:34:50Z hannes $
*******************************************************************/
-#include <kernel/mod2.h>
-+#include "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..0194fa4 100644
+index c7b571a..ad11c01 100644
--- a/kernel/p_Procs_Static.cc
+++ b/kernel/p_Procs_Static.cc
@@ -8,7 +8,7 @@
@@ -2116,12 +1985,12 @@ index c7b571a..0194fa4 100644
* Version: $Id: p_Procs_Static.cc 13051 2010-07-22 14:33:35Z hannes $
*******************************************************************/
-#include <kernel/mod2.h>
-+#include "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..18cf1c5 100644
+index 70c2bd2..32a84b3 100644
--- a/kernel/p_polys.cc
+++ b/kernel/p_polys.cc
@@ -10,7 +10,7 @@
@@ -2129,22 +1998,22 @@ index 70c2bd2..18cf1c5 100644
-#include <kernel/mod2.h>
-+#include "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..1b64bb6 100644
+index 19681d5..4011a14 100644
--- a/kernel/page.c
+++ b/kernel/page.c
@@ -1,4 +1,4 @@
-#include <kernel/mod2.h>
-+#include "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..03938f4 100644
+index 8afebcd..f0206f9 100644
--- a/kernel/polys-impl.cc
+++ b/kernel/polys-impl.cc
@@ -18,7 +18,7 @@
@@ -2152,12 +2021,12 @@ index 8afebcd..03938f4 100644
#include <stdio.h>
#include <string.h>
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#include <omalloc/omalloc.h>
#ifdef PDEBUG
diff --git a/kernel/polys.cc b/kernel/polys.cc
-index 65b0049..7567ce7 100644
+index 65b0049..443994f 100644
--- a/kernel/polys.cc
+++ b/kernel/polys.cc
@@ -11,7 +11,7 @@
@@ -2165,12 +2034,12 @@ index 65b0049..7567ce7 100644
#include <string.h>
#include <ctype.h>
-#include <kernel/mod2.h>
-+#include "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..b7517d8 100644
+index 2047151..6d24da9 100644
--- a/kernel/polys0.cc
+++ b/kernel/polys0.cc
@@ -8,7 +8,7 @@
@@ -2178,12 +2047,12 @@ index 2047151..b7517d8 100644
/* includes */
-#include <kernel/mod2.h>
-+#include "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..cdf28e3 100644
+index b7e6c35..382631d 100644
--- a/kernel/polys1.cc
+++ b/kernel/polys1.cc
@@ -10,7 +10,7 @@
@@ -2191,12 +2060,12 @@ index b7e6c35..cdf28e3 100644
/* includes */
#include <string.h>
-#include <kernel/mod2.h>
-+#include "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..6d309a8 100644
+index 1d7064d..9d26195 100644
--- a/kernel/prCopy.cc
+++ b/kernel/prCopy.cc
@@ -6,7 +6,7 @@
@@ -2204,12 +2073,12 @@ index 1d7064d..6d309a8 100644
*/
-#include <kernel/mod2.h>
-+#include "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..6ad28b5 100644
+index bc8697b..c88937c 100644
--- a/kernel/ratgring.cc
+++ b/kernel/ratgring.cc
@@ -8,7 +8,7 @@
@@ -2217,12 +2086,12 @@ index bc8697b..6ad28b5 100644
* Version: $Id: ratgring.cc 13262 2010-09-23 15:01:24Z levandov $
*******************************************************************/
-#include <kernel/mod2.h>
-+#include "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..37f4e92 100644
+index 418c3cb..477a73b 100644
--- a/kernel/ring.cc
+++ b/kernel/ring.cc
@@ -9,7 +9,7 @@
@@ -2230,12 +2099,12 @@ index 418c3cb..37f4e92 100644
/* includes */
#include <math.h>
-#include <kernel/mod2.h>
-+#include "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..d521553 100644
+index 9f3814b..2bbb4fb 100644
--- a/kernel/ringgb.cc
+++ b/kernel/ringgb.cc
@@ -8,7 +8,7 @@
@@ -2243,12 +2112,12 @@ index 9f3814b..d521553 100644
#define NO_BUCKETS
-#include <kernel/mod2.h>
-+#include "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..e71f9ef 100644
+index 79b8858..9921213 100644
--- a/kernel/ringgb.h
+++ b/kernel/ringgb.h
@@ -7,7 +7,7 @@
@@ -2256,12 +2125,12 @@ index 79b8858..e71f9ef 100644
#ifndef RINGGB_HEADER
#define RINGGB_HEADER
-#include <kernel/mod2.h>
-+#include "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..3ef442a 100644
+index 95b1f15..86b10f6 100644
--- a/kernel/rintegers.cc
+++ b/kernel/rintegers.cc
@@ -7,7 +7,7 @@
@@ -2269,12 +2138,12 @@ index 95b1f15..3ef442a 100644
#include <string.h>
-#include <kernel/mod2.h>
-+#include "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..fa0afb0 100644
+index 3c61878..986174a 100644
--- a/kernel/rmodulo2m.cc
+++ b/kernel/rmodulo2m.cc
@@ -7,7 +7,7 @@
@@ -2282,12 +2151,12 @@ index 3c61878..fa0afb0 100644
#include <string.h>
-#include <kernel/mod2.h>
-+#include "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..7e3511e 100644
+index b2a05b5..cfbe541 100644
--- a/kernel/rmodulon.cc
+++ b/kernel/rmodulon.cc
@@ -7,7 +7,7 @@
@@ -2295,12 +2164,12 @@ index b2a05b5..7e3511e 100644
#include <string.h>
-#include <kernel/mod2.h>
-+#include "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..d883e9d 100644
+index 839c7c8..6d4a110 100644
--- a/kernel/sbuckets.cc
+++ b/kernel/sbuckets.cc
@@ -9,7 +9,7 @@
@@ -2308,12 +2177,12 @@ index 839c7c8..d883e9d 100644
* Version: $Id: sbuckets.cc 13210 2010-09-17 13:36:19Z seelisch $
*******************************************************************/
-#include <kernel/mod2.h>
-+#include "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..10acbb3 100644
+index 6147086..ff2cd80 100644
--- a/kernel/sca.cc
+++ b/kernel/sca.cc
@@ -19,7 +19,7 @@
@@ -2321,12 +2190,25 @@ index 6147086..10acbb3 100644
// #define PDEBUG 2
-#include <kernel/mod2.h>
-+#include "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..a286ab9 100644
+index 3dc9189..6be6893 100644
--- a/kernel/shiftgb.cc
+++ b/kernel/shiftgb.cc
@@ -6,7 +6,7 @@
@@ -2334,12 +2216,12 @@ index 3dc9189..a286ab9 100644
*/
-#include <kernel/mod2.h>
-+#include "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..70579e7 100644
+index 9bed2bb..dd29897 100644
--- a/kernel/shortfl.cc
+++ b/kernel/shortfl.cc
@@ -8,7 +8,7 @@
@@ -2347,12 +2229,12 @@ index 9bed2bb..70579e7 100644
#include <string.h>
-#include <kernel/mod2.h>
-+#include "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..324a9a8 100644
+index 2bfbde6..9626efd 100644
--- a/kernel/sparsmat.cc
+++ b/kernel/sparsmat.cc
@@ -7,7 +7,7 @@
@@ -2360,12 +2242,12 @@ index 2bfbde6..324a9a8 100644
*/
-#include <kernel/mod2.h>
-+#include "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..4f662c9 100644
+index 1671a6e..98a8f4f 100644
--- a/kernel/spectrum.cc
+++ b/kernel/spectrum.cc
@@ -7,7 +7,7 @@
@@ -2373,12 +2255,12 @@ index 1671a6e..4f662c9 100644
#define SPECTRUM_CC
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_SPECTRUM
diff --git a/kernel/splist.cc b/kernel/splist.cc
-index c1db0ae..eba40c6 100644
+index c1db0ae..7a4b65a 100644
--- a/kernel/splist.cc
+++ b/kernel/splist.cc
@@ -7,7 +7,7 @@
@@ -2386,12 +2268,12 @@ index c1db0ae..eba40c6 100644
#define SPLIST_CC
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#ifdef HAVE_SPECTRUM
diff --git a/kernel/summator.cc b/kernel/summator.cc
-index be1cb41..9e29971 100644
+index be1cb41..8814eae 100644
--- a/kernel/summator.cc
+++ b/kernel/summator.cc
@@ -18,7 +18,7 @@
@@ -2399,12 +2281,12 @@ index be1cb41..9e29971 100644
#endif
-#include <kernel/mod2.h>
-+#include "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..8de43ec 100644
+index 1061e56..eecb98c 100644
--- a/kernel/syz.cc
+++ b/kernel/syz.cc
@@ -8,7 +8,7 @@
@@ -2412,12 +2294,12 @@ index 1061e56..8de43ec 100644
-#include <kernel/mod2.h>
-+#include "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..5f8cf28 100644
+index c2d8cbe..69e2c44 100644
--- a/kernel/syz0.cc
+++ b/kernel/syz0.cc
@@ -7,7 +7,7 @@
@@ -2425,12 +2307,12 @@ index c2d8cbe..5f8cf28 100644
-#include <kernel/mod2.h>
-+#include "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..6575944 100644
+index 1367c52..7aea035 100644
--- a/kernel/syz1.cc
+++ b/kernel/syz1.cc
@@ -6,7 +6,7 @@
@@ -2438,12 +2320,12 @@ index 1367c52..6575944 100644
*/
-#include <kernel/mod2.h>
-+#include "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..5318f81 100644
+index 636001d..67b6310 100644
--- a/kernel/syz2.cc
+++ b/kernel/syz2.cc
@@ -6,7 +6,7 @@
@@ -2451,12 +2333,12 @@ index 636001d..5318f81 100644
*/
-#include <kernel/mod2.h>
-+#include "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..553d5c2 100644
+index aff65e7..e225cd1 100644
--- a/kernel/syz3.cc
+++ b/kernel/syz3.cc
@@ -6,7 +6,7 @@
@@ -2464,12 +2346,12 @@ index aff65e7..553d5c2 100644
*/
-#include <kernel/mod2.h>
-+#include "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..7841fa4 100644
+index c92976e..b226497 100644
--- a/kernel/tgb.cc
+++ b/kernel/tgb.cc
@@ -14,7 +14,7 @@
@@ -2477,12 +2359,12 @@ index c92976e..7841fa4 100644
///@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 <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..d86c04f 100644
+index 681a38a..ed14563 100644
--- a/kernel/tgbgauss.cc
+++ b/kernel/tgbgauss.cc
@@ -5,7 +5,7 @@
@@ -2490,12 +2372,12 @@ index 681a38a..d86c04f 100644
* ABSTRACT: gauss implementation for F4
*/
-#include <kernel/mod2.h>
-+#include "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..79c8a86 100644
+index 3c9ab04..dc6cbc1 100644
--- a/kernel/tgbgauss.h
+++ b/kernel/tgbgauss.h
@@ -7,7 +7,7 @@
@@ -2503,12 +2385,12 @@ index 3c9ab04..79c8a86 100644
* ABSTRACT: gauss implementation for F4 header
*/
-#include <kernel/mod2.h>
-+#include "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..6263bbd 100644
+index 06d1ff4..a6ceedc 100644
--- a/kernel/timer.cc
+++ b/kernel/timer.cc
@@ -9,7 +9,7 @@
@@ -2516,12 +2398,12 @@ index 06d1ff4..6263bbd 100644
#include <unistd.h>
-#include <kernel/mod2.h>
-+#include "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..444dd44 100644
+index 99113d9..05e8d8c 100644
--- a/kernel/tmult.cc
+++ b/kernel/tmult.cc
@@ -5,7 +5,7 @@
@@ -2529,12 +2411,12 @@ index 99113d9..444dd44 100644
* Version: $Id: tmult.cc 14320 2011-07-04 14:48:27Z hannes $
*******************************************************************/
-#include <kernel/mod2.h>
-+#include "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..1a17e07 100644
+index 854dc5f..f15d0d9 100644
--- a/kernel/units.cc
+++ b/kernel/units.cc
@@ -6,7 +6,7 @@
@@ -2542,12 +2424,12 @@ index 854dc5f..1a17e07 100644
*/
-#include <kernel/mod2.h>
-+#include "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..5076a58 100644
+index 762a36a..6ca067c 100644
--- a/kernel/walkMain.cc
+++ b/kernel/walkMain.cc
@@ -7,7 +7,7 @@
@@ -2555,12 +2437,12 @@ index 762a36a..5076a58 100644
*/
#include <string.h>
-#include <kernel/mod2.h>
-+#include "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..68b76e2 100644
+index f90020a..223a9ca 100644
--- a/kernel/walkProc.cc
+++ b/kernel/walkProc.cc
@@ -3,7 +3,7 @@
@@ -2568,23 +2450,23 @@ index f90020a..68b76e2 100644
/* $Id: walkProc.cc 13210 2010-09-17 13:36:19Z seelisch $ */
-#include <kernel/mod2.h>
-+#include "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..d6a0d41 100644
+index ea9c1fa..ada42f7 100644
--- a/kernel/walkSupport.cc
+++ b/kernel/walkSupport.cc
@@ -1,5 +1,5 @@
#include <string.h>
-#include <kernel/mod2.h>
-+#include "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..3c0aa88 100644
+index b1ea7d1..ee073aa 100644
--- a/kernel/weight.cc
+++ b/kernel/weight.cc
@@ -8,7 +8,7 @@
@@ -2592,12 +2474,12 @@ index b1ea7d1..3c0aa88 100644
#include <math.h>
-#include <kernel/mod2.h>
-+#include "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..85dad19 100644
+index 3efb3a7..ffbe6a4 100644
--- a/kernel/weight0.c
+++ b/kernel/weight0.c
@@ -9,7 +9,7 @@
@@ -2605,7 +2487,7 @@ index 3efb3a7..85dad19 100644
#include <math.h>
#include <string.h>
-#include <kernel/mod2.h>
-+#include "mod2.h"
++#include <Singular/mod2.h>
#include <omalloc/omalloc.h>
#include <kernel/structs.h>
diff --git a/debian/patches/series b/debian/patches/series
index 663d0d6..80d1d36 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,9 @@
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-path-fixes.patch
-0004-Fix-FTBFS-with-ld-as-needed.-LP-832790.patch
+0003-fix-build-issues.patch
+0004-default-path-settings.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
+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
--
an open source computer algebra system
More information about the debian-science-commits
mailing list