[singular] 13/13: merge patched-master-3-1-5 into master-3-1-5
felix salfelder
felix-guest at alioth.debian.org
Tue Aug 20 08:36:06 UTC 2013
This is an automated email from the git hooks/post-receive script.
felix-guest pushed a commit to branch master-3-1-5
in repository singular.
commit 762b45044b658364388cb31b25a4060e3f5e35e5
Merge: f588224 89a59f0
Author: Felix Salfelder <felix at salfelder.org>
Date: Tue Aug 20 10:34:51 2013 +0200
merge patched-master-3-1-5 into master-3-1-5
Singular/LIB/polymake.lib | 2688 ------------
Singular/bbcone.cc | 1271 ------
Singular/bbfan.cc | 733 ----
Singular/bbpolytope.cc | 481 ---
Singular/install-sh | 246 --
Singular/svnver | 1 -
Tst/Old/lib0.lib | 1068 -----
Tst/Old/lib0.test | 1072 -----
callpolymake/polymake.cc | 451 --
debian/.git-dpm | 6 +-
debian/patches/0001-tag-gfan-using-examples.patch | 2 +-
...ESTDIR-as-a-pre-prefix-in-install-targets.patch | 2 +-
...003-add-working-all-target-to-Makefile.in.patch | 2 +-
.../0004-miscellaneous-Makefile.in-patches.patch | 2 +-
...eeds-to-be-defined-after-include-assert.h.patch | 2 +-
debian/patches/0006-keep-mod2.h-in-Singular.patch | 18 +-
.../0007-move-libreadline-to-main-binary.patch | 2 +-
debian/patches/0008-default-path-settings.patch | 2 +-
.../0009-fix-NTL-negate-namespace-issue.patch | 2 +-
...install-factory.h-where-libfac-expects-it.patch | 2 +-
factory/abs_fac.cc | 1074 -----
factory/bifac.cc | 1294 ------
factory/bifac.h | 100 -
factory/bifacConfig.h | 49 -
factory/fex/ChangeLog | 29 -
factory/fex/gcdUnivP.fex | 407 --
factory/fex/gcdUnivPAlpha.fex | 304 --
factory/fex/insert.fex | 100 -
factory/fex/runfex | 533 ---
factory/fex/stdUnivPGcd.in | 268 --
factory/fieldGCD.cc | 248 --
factory/fieldGCD.h | 8 -
factory/ftest/ChangeLog | 566 ---
factory/ftest/GNUmakefile.in | 156 -
factory/ftest/bextgcd.m4 | 125 -
factory/ftest/bgcd.m4 | 116 -
factory/ftest/commonden.m4 | 51 -
factory/ftest/degree.m4 | 62 -
factory/ftest/deriv.m4 | 61 -
factory/ftest/divides.m4 | 120 -
factory/ftest/divrem.m4 | 119 -
factory/ftest/extgcd.m4 | 132 -
factory/ftest/factorize.m4 | 62 -
factory/ftest/fbinops.m4 | 345 --
factory/ftest/feval.m4 | 204 -
factory/ftest/ftest_io.cc | 221 -
factory/ftest/ftest_io.h | 26 -
factory/ftest/ftest_util.cc | 1164 -----
factory/ftest/ftest_util.h | 66 -
factory/ftest/ftest_util.m4 | 292 --
factory/ftest/gcd.m4 | 121 -
factory/ftest/gcd.ntl.m4 | 159 -
factory/ftest/insert.m4 | 64 -
factory/ftest/norm.m4 | 62 -
factory/ftest/ntl_util.cc | 242 --
factory/ftest/ntl_util.h | 31 -
factory/ftest/resultant.m4 | 56 -
factory/ftest/revert.m4 | 49 -
factory/ftest/size.m4 | 62 -
factory/ftest/sqrfree.m4 | 58 -
factory/ftest/totaldegree.m4 | 65 -
factory/lgs.cc | 309 --
factory/lgs.h | 62 -
factory/sm_sparsemod.cc | 629 ---
factory/sm_sparsemod.h | 21 -
factory/sm_util.cc | 328 --
factory/sm_util.h | 33 -
factory/winnt/INSTALL.nt | 29 -
factory/winnt/factory.h | 1048 -----
factory/winnt/factoryconf.h | 237 -
factory/winnt/nt.mak | 81 -
kernel/bbcone.h | 26 -
kernel/bbfan.h | 17 -
kernel/bbpolytope.h | 17 -
kernel/gfan.cc | 4512 --------------------
kernel/gfan.h | 274 --
kernel/install-sh | 246 --
kernel/mod2.h.in | 622 ---
kernel/testgh | 19 -
79 files changed, 14 insertions(+), 25820 deletions(-)
diff --cc debian/.git-dpm
index 88da7f8,0000000..5b3a33e
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 80af528c075a9215ceb425f9221350be1a184fc3
- 80af528c075a9215ceb425f9221350be1a184fc3
- 01299c5795a0c0b3842c1f6d3bc30d3714fc1248
++89a59f0679fe904fa320156d4411f18d5e106b08
++89a59f0679fe904fa320156d4411f18d5e106b08
++c2d0b997183a0cc911fdef0861638995bafededc
+c2d0b997183a0cc911fdef0861638995bafededc
+singular_3-1-5.dfsg.orig.tar.gz
+eb6aabf3f389eec6a4605e43e807d946b432c0d9
+19748109
diff --cc debian/patches/0001-tag-gfan-using-examples.patch
index 5714ded,0000000..36fc5b1
mode 100644,000000..100644
--- a/debian/patches/0001-tag-gfan-using-examples.patch
+++ b/debian/patches/0001-tag-gfan-using-examples.patch
@@@ -1,429 -1,0 +1,429 @@@
- From fade56b642256bc143bb6fd75e5e101e6075fd0a Mon Sep 17 00:00:00 2001
++From 2c8248effc13778d3c973e1d2017915fb6fef95c Mon Sep 17 00:00:00 2001
+From: "Bernhard R. Link" <brlink at debian.org>
+Date: Sat, 3 Mar 2012 10:17:51 +0100
+Subject: tag gfan using examples
+
+Tag all examples in cones.doc, so that the manual can be built
+even if compiled without gfan support.
+---
+ doc/cones.doc | 92 +++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 46 insertions(+), 46 deletions(-)
+
+diff --git a/doc/cones.doc b/doc/cones.doc
+index a2e652e..75c287e 100644
+--- a/doc/cones.doc
++++ b/doc/cones.doc
+@@ -52,7 +52,7 @@ vectors of L is the lineality space of the cone,
+ if either bit is 0, then program computes the information itself.
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ // Let's define a cone in R^3 generated by the following half lines:
+ intmat HL[5][3]=
+ 1,0, 0,
+@@ -117,7 +117,7 @@ if lower bit is 1, then program assumes the kernel of E is the span of the cone,
+ if either bit is 0, then program computes the information itself.
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ // Let's define a cone in R^3 given by the following inequalities:
+ intmat IE[6][3]=
+ 1,3,5,
+@@ -211,7 +211,7 @@ cone
+ canonicalized version of the cone, no more redundant inequalities and equations
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[11][3]=
+ 0,-1,1,
+ -1,1,0,
+@@ -244,7 +244,7 @@ cone
+ local version of the given cone around the given point of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[3][3]=
+ 1,0,0,
+ 0,1,0,
+@@ -306,7 +306,7 @@ int
+ 1 iff c1 entirely contains c2 resp. iff c contains the given point, possibly on one of its facets; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][2]=
+ 1,0,
+ 0,1;
+@@ -343,7 +343,7 @@ int
+ 1 iff the cone contains a point with positive coordinates in its relative interior; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,1,
+ 1,-1;
+@@ -371,7 +371,7 @@ int
+ 1 iff the given cone contains the given point in its relative interior; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][2]=
+ 1,0,
+ 0,1;
+@@ -399,7 +399,7 @@ int
+ ambient dimension of the cone;
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -429,7 +429,7 @@ int
+ codimension of the cone;
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[1][2]=
+ 1,0;
+ cone c1=coneViaPoints(M1);
+@@ -457,7 +457,7 @@ int
+ dimension of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[1][2]=
+ 1,0;
+ cone c1=coneViaPoints(M1);
+@@ -483,7 +483,7 @@ cone
+ the dual of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -516,7 +516,7 @@ bigintmat
+ equations given by the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -546,7 +546,7 @@ bigintmat
+ inner normal vectors of the facets of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -576,7 +576,7 @@ bigintmat
+ generating vectors of the lineality space of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[5][3]=
+ 1,0,0,
+ 0,1,0,
+@@ -603,7 +603,7 @@ bigintmat
+ generating vectors of the span of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[3][5]=
+ 1,0,0,0,0,
+ 0,1,0,0,0,
+@@ -654,7 +654,7 @@ bigintmat
+ generating vectors of the orthogonal complement of the span of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[3][5]=
+ 1,0,0,0,0,
+ 0,1,0,0,0,
+@@ -679,7 +679,7 @@ bigintmat
+ inequalities given by the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -709,7 +709,7 @@ int
+ dimension of the lineality space of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[3][3]=
+ 1,0,0,
+ 0,1,0,
+@@ -740,7 +740,7 @@ cone
+ the lineality space of the cone as a new cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[3][3]=
+ 1,0,0,
+ 0,1,0,
+@@ -774,7 +774,7 @@ intvec
+ linear forms of the cone (can be set by setLinearForms); returns empty intmat if not set
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][3]=
+ -1,0,0,
+ 0,-1,0;
+@@ -800,7 +800,7 @@ cone
+ the negated (or negative) of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][2]=
+ 1,0,
+ 0,1;
+@@ -825,7 +825,7 @@ bigintmat%
+ quotient of Z^n intersected with the span of the cone with Z^n intersected with its lineality space
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[3][2]=
+ 1,0,
+ 0,1,
+@@ -850,7 +850,7 @@ bigintmat
+ rays of the cone outside the lineality space, rays inside the lineality space will be ignored
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -881,7 +881,7 @@ intvec
+ point in the relative interior of the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -909,7 +909,7 @@ intvec
+ if dimension(c)=linealityDimension(c)+1, then the quotient lattice of Z^n intersected with the span and Z^n intersected with the lineality space is Z^1 and the class of the cone is a semigroup. returns a generator of that semigroup. (like quotientLatticeBasis(cone c), but as intvec)
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[3][2]=
+ 1,0,
+ 0,1,
+@@ -933,7 +933,7 @@ intvec
+ special-purpose interior point which supports recognition of symmetries among non-intersecting cones (used in implementation of fans)
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -964,7 +964,7 @@ cone if both input arguments are cones, else polytope
+ the hull of the two objects
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -1006,7 +1006,7 @@ cone if both input arguments are cones, else polytope
+ the intersection of the two objects
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[2][2]=
+ 1,0,
+ 0,1;
+@@ -1045,7 +1045,7 @@ int
+ 1 iff the cone is the entire ambient space; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ cone c1;
+ isFullSpace(c1);
+ intmat M2[2][2]=
+@@ -1077,7 +1077,7 @@ int
+ 1 iff the cone is just the origin of the ambient space; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ cone c1; // full cone in zero-dimensional ambient space
+ isOrigin(c1);
+ intmat M2[2][2]=
+@@ -1110,7 +1110,7 @@ int
+ 1 iff the cone resp. fan is simplicial; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M1[3][3]=
+ 1,0,0,
+ 0,1,0,
+@@ -1159,7 +1159,7 @@ isSimplicial(f);
+ adds the information of a linear form to the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][3]=
+ -1,0,0,
+ 0,-1,0;
+@@ -1185,7 +1185,7 @@ linearForms(c);
+ adds the information of a multiplicity to the cone
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][3]=
+ -1,0,0,
+ 0,-1,0;
+@@ -1329,7 +1329,7 @@ cone
+ 1 iff c is contained in the collection of cones that is f; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=emptyFan(2);
+ intmat M[2][2]=
+ 1,0,
+@@ -1419,7 +1419,7 @@ cone
+ cone (orbit=0) or orbit (orbit=1) of a certain index (ranges from 1 to numberOfConesOfDimension(f,2,0,0)) in a given dimension; if maximal=0, all cones and orbits are considered, if maximal=1, only maximal cones and orbits are considered
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[3][3]=
+ 1,0,0,
+ 0,1,0,
+@@ -1448,7 +1448,7 @@ none
+ inserts the cone into the fan; checks for compatibility beforehand unless check is passed and equal 0
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=emptyFan(3);
+ f;
+ intmat M[3][3]=
+@@ -1476,7 +1476,7 @@ int
+ 1 iff cone is compatible with the fan; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=emptyFan(3);
+ intmat M1[3][3]=
+ 1,0,0,
+@@ -1514,7 +1514,7 @@ isCompatible(f,c3);
+ @c 1 iff the fan is complete; 0 otherwise
+ @c @item @strong{Example:}
+ @c @smallexample
+- at c @c example
++ at c @c example tag:gfan
+ @c fan f=fullFan(2);
+ @c isComplete(f);
+ @c fan g=emptyFan(2);
+@@ -1554,7 +1554,7 @@ int
+ 1 iff the fan is pure; 0 otherwise
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=fullFan(2);
+ isPure(f);
+ fan g=emptyFan(2);
+@@ -1586,7 +1586,7 @@ int
+ number of maximal cones in f
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=emptyFan(3);
+ nmaxcones(f);
+ intmat M1[3][3]=
+@@ -1619,7 +1619,7 @@ int
+ number of cones in f
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=emptyFan(3);
+ ncones(f);
+ intmat M1[3][3]=
+@@ -1652,7 +1652,7 @@ int
+ number of cones (orbit=0) or orbits (orbit=1) of a given dimension; if maximal=0, then all cones are considered, if maximal=1, only maximal cones are considered
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ fan f=emptyFan(3);
+ ncones(f);
+ intmat M[3][3]=
+@@ -1687,7 +1687,7 @@ none
+ removes the cone from the fan; checks for compatibility beforehand unless check is passed and equal 0
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[2][2]=1,0,0,1;
+ intmat N[2][2]=1,0,1,-1;
+ cone c=coneViaPoints(M);
+@@ -1741,7 +1741,7 @@ a vertex of the polytope,
+ if flags is 0, then program computes the information itself.
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ // Let's a polytope in R^2 generated by:
+ intmat V[4][3]=
+ 1,0,0,
+@@ -1782,7 +1782,7 @@ if lower bit is 1, then program assumes the kernel of E is the span of the cone,
+ if either bit is 0, then program computes the information itself.
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat IE[2][3]=
+ 1,0,0,
+ 0,1,0;
+@@ -1876,7 +1876,7 @@ intmat
+ vertices of p
+ @item @strong{Example:}
+ @smallexample
+- at c example
++ at c example tag:gfan
+ intmat M[4][3]=
+ 1,0,0,
+ 1,2,0,
diff --cc debian/patches/0002-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
index be8f9ab,0000000..eab6207
mode 100644,000000..100644
--- a/debian/patches/0002-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
+++ b/debian/patches/0002-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
@@@ -1,344 -1,0 +1,344 @@@
- From 7442849937cc698cadbc71d6a3ce40cc1c62f7a1 Mon Sep 17 00:00:00 2001
++From 21700caa423e193a79b262946e2e254a3cc72caa Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Thu, 16 Feb 2012 08:45:58 +0100
+Subject: use $DESTDIR as a pre-prefix, in install* targets
+
+---
+ IntegerProgramming/Makefile.in | 12 +++---
+ Singular/Makefile.in | 85 +++++++++++++++++++-----------------------
+ factory/GNUmakefile.in | 25 +++++++------
+ kernel/Makefile.in | 20 +++++-----
+ libfac/Makefile.in | 14 +++----
+ omalloc/Makefile.in | 22 +++++------
+ 6 files changed, 85 insertions(+), 93 deletions(-)
+
+diff --git a/IntegerProgramming/Makefile.in b/IntegerProgramming/Makefile.in
+index 50de520..05fccfe 100644
+--- a/IntegerProgramming/Makefile.in
++++ b/IntegerProgramming/Makefile.in
+@@ -63,12 +63,12 @@ install-nolns: install
+ install_all: install
+
+ install install-libsingular: $(MAIN1) $(MAIN2) $(MAIN3) $(MAIN4) $(LLL)
+- ${MKINSTALLDIRS} ${bindir}
+- ${INSTALL_PROGRAM} $(MAIN1) ${bindir}
+- ${INSTALL_PROGRAM} $(MAIN2) ${bindir}
+- ${INSTALL_PROGRAM} $(MAIN3) ${bindir}
+- ${INSTALL_PROGRAM} $(MAIN4) ${bindir}
+- ${INSTALL_PROGRAM} $(LLL) ${bindir}
++ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} $(MAIN1) $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} $(MAIN2) $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} $(MAIN3) $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} $(MAIN4) $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} $(LLL) $(DESTDIR)${bindir}
+
+ install-bindist: $(MAIN1) $(MAIN2) $(MAIN3) $(MAIN4)
+ ${MKINSTALLDIRS} ${install_bindir}
+diff --git a/Singular/Makefile.in b/Singular/Makefile.in
+index c4a6e78..3e02df1 100644
+--- a/Singular/Makefile.in
++++ b/Singular/Makefile.in
+@@ -556,51 +556,42 @@ install_all: install
+ install-nolns: all installbin-nolns installslib-nolns
+
+ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
+- ${MKINSTALLDIRS} ${bindir}
+- ${INSTALL_PROGRAM} ${SING_EXEC} ${SINGULAR}
++ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${SINGULAR}
+ -for file in *.so; do \
+- ${INSTALL_PROGRAM} $$file ${bindir}; \
++ ${INSTALL_PROGRAM} $$file $(DESTDIR)${bindir}; \
+ done
+- ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} ${bindir}
+- ${INSTALL_PROGRAM} ESingular TSingular ${bindir}
+- ${INSTALL_PROGRAM} surfex ${bindir}
+- chmod a+x ${SINGULAR}
+- rm -f ${bindir}/${SING_EXEC}${EXEC_EXT}
+- cd ${bindir}; ${LN_S} ${SINGULAR} Singular${EXEC_EXT};
+-
+-installbin-nolns: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
+- ${MKINSTALLDIRS} ${bindir}
+- ${INSTALL_PROGRAM} ${SING_EXEC} ${SINGULAR}
+- -for file in *.so; do \
+- ${INSTALL_PROGRAM} $$file ${bindir}; \
+- done
+- ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} ${bindir}
+- ${INSTALL_PROGRAM} ESingular TSingular ${DL_LIBS} ${bindir}
+- chmod a+x ${SINGULAR}
+- rm -f ${bindir}/${SING_EXEC}${EXEC_EXT}
+- ${INSTALL_PROGRAM} ${SINGULAR} ${bindir}/Singular${EXEC_EXT};
++ ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} ESingular TSingular $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} surfex $(DESTDIR)${bindir}
++ chmod a+x $(DESTDIR)${SINGULAR}
++ rm -f $(DESTDIR)${bindir}/${SING_EXEC}${EXEC_EXT}
++ cd $(DESTDIR)${bindir}; ${LN_S} ${SINGULAR} Singular${EXEC_EXT};
++
++installbin-nolns: installbin
++ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${install_bindir}/Singular${EXEC_EXT};
+
+ installslib: LIB
+ test -r ${slibdir} || ${LN_S} `pwd`/LIB ${slibdir}
+
+ installslib-nolns: LIB
+- ${MKINSTALLDIRS} ${slibdir}
++ ${MKINSTALLDIRS} $(DESTDIR)${slibdir}
+ for file in `pwd`/LIB/*.lib; do \
+- ${INSTALL_DATA} $$file ${slibdir}; \
++ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
+ done
+- ${MKINSTALLDIRS} ${slibdir}/gftables
++ ${MKINSTALLDIRS} $(DESTDIR)${slibdir}/gftables
+ for file in `pwd`/LIB/gftables/*; do \
+- ${INSTALL_DATA} $$file ${slibdir}/gftables/; \
++ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
+ done
+
+ install-libsingular: libsingular installslib-nolns
+- ${MKINSTALLDIRS} ${includedir}/singular
++ ${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
+ for file in *.$(SO_SUFFIX); do \
+- ${INSTALL_PROGRAM} $$file ${libdir}; \
++ ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
+ done
+- ${INSTALL_PROGRAM} libsingular.h ${includedir}
++ ${INSTALL_PROGRAM} libsingular.h $(DESTDIR)${includedir}
+ for file in subexpr.h tok.h grammar.h ipid.h lists.h ipshell.h attrib.h; do \
+- sed -e "s:<kernel/:<singular/:" < $$file |sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" >${includedir}/singular/$$file ;\
++ sed -e "s:<kernel/:<singular/:" < $$file |sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" >$(DESTDIR)${includedir}/singular/$$file ;\
+ done
+
+ uninstall: uninstallbin
+@@ -650,23 +641,23 @@ LIB/all.lib: LIB/all.lib.tmpl
+
+ install-bindist: $(HEADERS) $(SOURCES) Makefile depend
+ echo "#define MAKE_DISTRIBUTION " > distrib.h
+- sleep 1
+- ${MAKE} ${SING_EXEC} ESingular TSingular libparse ${RUN_SINGULARS}
+- ${MKINSTALLDIRS} ${install_bindir}
+- ${INSTALL_PROGRAM} ${SING_EXEC} ${install_bindir}/Singular
+- -${INSTALL_PROGRAM} *.so ${install_bindir}
+- ${INSTALL_PROGRAM} -s libparse ${RUN_SINGULARS} ESingular TSingular ${install_bindir}
+- ${INSTALL_PROGRAM} surfex ${install_bindir}
++ # sleep 1
++ ${MAKE} ${SING_EXEC} ESingular TSingular libparse $(DESTDIR)${RUN_SINGULARS}
++ ${MKINSTALLDIRS} $(DESTDIR)${install_bindir}
++ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${install_bindir}/Singular
++ -${INSTALL_PROGRAM} *.so $(DESTDIR)${install_bindir}
++ ${INSTALL_PROGRAM} -s libparse ${RUN_SINGULARS} ESingular TSingular $(DESTDIR)${install_bindir}
++ ${INSTALL_PROGRAM} surfex $(DESTDIR)${install_bindir}
+ echo "#undef MAKE_DISTRIBUTION " > distrib.h
+
+ install-sharedist: ${SLIBS_FILES} LIB/gftables
+- ${MKINSTALLDIRS} ${install_slibdir}
+- cp ${SLIBS_FILES} ${install_slibdir}
+- ${MKINSTALLDIRS} ${install_slibdir}/gftables
+- cp ${GFTABLES} ${install_slibdir}/gftables
+- ${MKINSTALLDIRS} ${install_slibdir}/surfex
+- cp LIB/surfex/surfex.jar ${install_slibdir}/surfex
+- chmod -R +rX ${install_slibdir}/*
++ ${MKINSTALLDIRS} $(DESTDIR)${install_slibdir}
++ cp ${SLIBS_FILES} $(DESTDIR)${install_slibdir}
++ ${MKINSTALLDIRS} $(DESTDIR)${install_slibdir}/gftables
++ cp ${GFTABLES} $(DESTDIR)${install_slibdir}/gftables
++ ${MKINSTALLDIRS} $(DESTDIR)${install_slibdir}/surfex
++ cp LIB/surfex/surfex.jar $(DESTDIR)${install_slibdir}/surfex
++ chmod -R +rX $(DESTDIR)${install_slibdir}/*
+
+ tar:
+ tar cf Singular-${SINGULAR_VERSION}-src.tar ${DISTFILES}
+@@ -764,8 +755,8 @@ mpsr_Tok.og: iparith.inc mpsr_Tok.cc
+ $(CXXG) ${CXXFLAGSG} ${CPPFLAGS} ${CXXTEMPLFLAGSG} ${DEFSG} -c mpsr_Tok.cc -o mpsr_Tok.og
+
+ installg: Singularg
+- ${MKINSTALLDIRS} ${bindir}
+- ${INSTALL_PROGRAM} Singularg ${bindir}
++ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} Singularg $(DESTDIR)${bindir}
+
+ ESingularg: mod2.h feOpt.cc version.h emacs.cc \
+ feOptES.inc
+@@ -844,8 +835,8 @@ mpsr_Tok.op: iparith.inc mpsr_Tok.cc
+ $(CXXP) ${CXXFLAGSP} ${CPPFLAGS} ${CXXTEMPLFLAGSP} ${DEFSP} -c mpsr_Tok.cc -o mpsr_Tok.op
+
+ installp: Singularp
+- ${MKINSTALLDIRS} ${bindir}
+- ${INSTALL_PROGRAM} Singularp ${bindir}
++ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
++ ${INSTALL_PROGRAM} Singularp $(DESTDIR)${bindir}
+
+ ##
+ ## dependencies
+diff --git a/factory/GNUmakefile.in b/factory/GNUmakefile.in
+index 61d0db2..85d866b 100644
+--- a/factory/GNUmakefile.in
++++ b/factory/GNUmakefile.in
+@@ -543,21 +543,22 @@ install_all: install libsingcf_p.a
+ install-nolns: install
+
+ installcf: cf
+- $(MKINSTALLDIRS) $(libdir)
+- $(MKINSTALLDIRS) $(includedir)
+- $(MKINSTALLDIRS) $(templatedir)
+- $(INSTALL_DATA) $(libfactory) $(libdir)/$(libfactory)
+- -$(INSTALL_DATA) libsingcf_g.a $(libdir)/libsingcf_g.a
+- -$(INSTALL_DATA) libsingcf_p.a $(libdir)/libsingcf_p.a
+- $(INSTALL_DATA) factory.h $(includedir)/factory.h
+- $(INSTALL_DATA) cf_gmp.h $(includedir)/cf_gmp.h
+- $(INSTALL_DATA) factoryconf.h $(includedir)/factoryconf.h
+- $(INSTALL_DATA) $(srcdir)/ftmpl_inst.cc $(templatedir)/ftmpl_inst.cc
++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(includedir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(templatedir)
++ $(INSTALL_DATA) $(libfactory) $(DESTDIR)$(libdir)/$(libfactory)
++ -$(INSTALL_DATA) libsingcf_g.a $(DESTDIR)$(libdir)/libsingcf_g.a
++ -$(INSTALL_DATA) libsingcf_p.a $(DESTDIR)$(libdir)/libsingcf_p.a
++ $(INSTALL_DATA) factory.h $(DESTDIR)$(includedir)/factory.h
++ $(INSTALL_DATA) cf_gmp.h $(DESTDIR)$(includedir)/factory/cf_gmp.h
++ $(INSTALL_DATA) factoryconf.h $(DESTDIR)$(includedir)/factory/factoryconf.h
++ # FIXME: what is templatedir?
++ $(INSTALL_DATA) $(srcdir)/ftmpl_inst.cc $(DESTDIR)$(templatedir)/ftmpl_inst.cc
+ for file in $(templatesrc) $(templateincl); do \
+- $(INSTALL_DATA) $(srcdir)/templates/$$file $(templatedir)/$$file; \
++ $(INSTALL_DATA) $(srcdir)/templates/$$file $(DESTDIR)$(templatedir)/$$file; \
+ done
+ # we run `ranlib' another time for SUN machines
+- $(RANLIB) $(libdir)/$(libfactory)
++ $(RANLIB) $(DESTDIR)$(libdir)/$(libfactory)
+
+ installmem: mem
+ $(MKINSTALLDIRS) $(libdir)
+diff --git a/kernel/Makefile.in b/kernel/Makefile.in
+index adc9cd9..6f58083 100644
+--- a/kernel/Makefile.in
++++ b/kernel/Makefile.in
+@@ -48,7 +48,7 @@ PIPE = @PIPE@
+ CFLAGS = @CFLAGS@ ${PIPE}
+ CXXFLAGS = @CXXFLAGS@ ${PIPE}
+ CXXTEMPLFLAGS = @CXXTEMPLFLAGS@
+-CPPFLAGS = -I${srcdir} -I.. -I at prefix@ @CPPFLAGS@
++CPPFLAGS = -I${srcdir} -I.. -I at prefix@ @CPPFLAGS@
+ DEFS = -DNDEBUG -DOM_NDEBUG -D at SING_UNAME@ @DEFS@
+ LDFLAGS = @LDFLAGS@
+ LD_DYN_FLAGS = @LD_DYN_FLAGS@
+@@ -236,7 +236,7 @@ libkernel.a: ${OBJS}
+ -rm -f libkernel.a
+ ar cr $@ $^
+
+-p_Procs_Lib.o: p_Procs_Lib.inc
++p_Procs_Lib.o: p_Procs_Dynamic.inc
+
+ # Hmm compiling with -fomit-frame-pointer resulted in access violation
+ # under cygwin
+@@ -253,12 +253,12 @@ p_Procs_Dynamic.o p_Procs_Lib.o p_Procs_Dynamic.og p_Procs_Lib.og\
+ p_Procs_Dynamic.inc p_Procs_Lib.inc: p_Procs_Dynamic.h
+
+ # here is how p_Procs_[Static|Dynamic].inc is generated
+-p_Procs_Static.inc: p_Procs_Generate.cc p_Procs_Impl.h mod2.h
++p_Procs_Static.inc: p_Procs_Generate.cc p_Procs_Impl.h |mod2.h
+ $(CXX) $(CPPFLAGS) -g -Dp_Procs_Static p_Procs_Generate.cc -o p_Procs_Static
+ ./p_Procs_Static > p_Procs_Static.xx && mv p_Procs_Static.xx p_Procs_Static.inc
+ -rm -f p_Procs_Static p_Procs_Static.exe
+
+-p_Procs_Dynamic.inc: p_Procs_Generate.cc p_Procs_Impl.h mod2.h
++p_Procs_Dynamic.inc: p_Procs_Generate.cc p_Procs_Impl.h |mod2.h
+ $(CXX) $(CPPFLAGS) -g -Dp_Procs_Dynamic p_Procs_Generate.cc -o p_Procs_Dynamic
+ ./p_Procs_Dynamic > p_Procs_Dynamic.xx && mv p_Procs_Dynamic.xx p_Procs_Dynamic.inc
+ -rm -f p_Procs_Dynamic p_Procs_Dynamic.exe
+@@ -272,9 +272,9 @@ p_Procs_%.so: p_Procs_Lib_%.dl_o
+ install-nolns: install
+
+ install-libsingular: install
+- -${MKINSTALLDIRS} ${includedir}
+- -${MKINSTALLDIRS} ${includedir}/singular
+- -for file in *.h kInline.cc; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > ${includedir}/singular/$$file; done
++ ${MKINSTALLDIRS} $(DESTDIR)${includedir}
++ ${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
++ for file in *.h kInline.cc; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > $(DESTDIR)${includedir}/singular/$$file; done
+
+ install: all installbin
+
+@@ -290,12 +290,12 @@ endif
+
+
+ installbin: ${DL_LIBS} ${DL_LIBSG} libkernel.a libkernel_g.a
+- ${MKINSTALLDIRS} ${bindir}
++ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
+ - ranlib libkernel.a
+ - ranlib libkernel_g.a
+ ifeq (,${DL_LIBS})
+ else
+- -${INSTALL_PROGRAM} ${DL_LIBS} ${bindir}
++ ${INSTALL_PROGRAM} ${DL_LIBS} $(DESTDIR)${bindir}
+ ifeq (,${DL_LIBSG})
+ else
+ -for file in ${DL_LIBS} ${DL_LIBSG}; do ${INSTALL_PROGRAM} $$file ../Singular; done
+@@ -307,7 +307,7 @@ install-bindist: ${DL_LIBS} libkernel.a
+ ${MKINSTALLDIRS} ${bindir}
+ ifeq (,${DL_LIBS})
+ else
+- -${INSTALL_PROGRAM} ${DL_LIBS} ${bindir}
++ ${INSTALL_PROGRAM} ${DL_LIBS} $(DESTDIR)${bindir}
+ endif
+
+ ##
+diff --git a/libfac/Makefile.in b/libfac/Makefile.in
+index c2b38eb..1f2953f 100644
+--- a/libfac/Makefile.in
++++ b/libfac/Makefile.in
+@@ -146,13 +146,13 @@ libsingfac_p.a: $(PROFOBJ)
+ install-nolns: install
+
+ install install-libsingular: all
+- ${MKINSTALLDIRS} ${includedir}
+- ${MKINSTALLDIRS} ${libdir}
+- ${INSTALL_DATA} ${LIBFACINCLUDE} ${includedir}
+- ${INSTALL_DATA} ${TARGETNAME}.a ${libdir}
+- -${INSTALL_DATA} libsingfac_g.a ${libdir}
+- $(RANLIB) ${libdir}/${TARGETNAME}.a
+- -$(RANLIB) ${libdir}/libsingfac_g.a
++ ${MKINSTALLDIRS} $(DESTDIR)${includedir}
++ ${MKINSTALLDIRS} $(DESTDIR)${libdir}
++ ${INSTALL_DATA} ${LIBFACINCLUDE} $(DESTDIR)${includedir}
++ ${INSTALL_DATA} ${TARGETNAME}.a $(DESTDIR)${libdir}
++ -${INSTALL_DATA} libsingfac_g.a $(DESTDIR)${libdir}
++ $(RANLIB) $(DESTDIR)${libdir}/${TARGETNAME}.a
++ -$(RANLIB) $(DESTDIR)${libdir}/libsingfac_g.a
+
+ install_all: install libsingfac_p.a
+ -${INSTALL_DATA} libsingfac_p.a ${libdir}
+diff --git a/omalloc/Makefile.in b/omalloc/Makefile.in
+index 98a7e95..8661ca2 100644
+--- a/omalloc/Makefile.in
++++ b/omalloc/Makefile.in
+@@ -185,17 +185,17 @@ install-libsingular:
+ $(INSTALL) omalloc.h $(includedir)/singular
+
+ install install-libsingular: all
+- $(MKINSTALLDIRS) $(libdir)
+- $(MKINSTALLDIRS) $(includedir)
+- $(INSTALL_DATA) libomalloc.a $(libdir)
+- $(RANLIB) $(libdir)/libomalloc.a
+- $(INSTALL_DATA) libomalloc_ndebug.a $(libdir)
+- $(RANLIB) $(libdir)/libomalloc_ndebug.a
+- $(INSTALL_DATA) omalloc.o $(libdir)
+- $(INSTALL_DATA) omalloc_debug.o $(libdir)
+- $(INSTALL_DATA) omalloc.h $(includedir)
+- $(INSTALL_DATA) omlimits.h $(includedir)
+- $(INSTALL_DATA) mylimits.h $(includedir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(includedir)
++ $(INSTALL_DATA) libomalloc.a $(DESTDIR)$(libdir)
++ $(RANLIB) $(DESTDIR)$(libdir)/libomalloc.a
++ $(INSTALL_DATA) libomalloc_ndebug.a $(DESTDIR)$(libdir)
++ $(RANLIB) $(DESTDIR)$(libdir)/libomalloc_ndebug.a
++ $(INSTALL_DATA) omalloc.o $(DESTDIR)$(libdir)
++ $(INSTALL_DATA) omalloc_debug.o $(DESTDIR)$(libdir)
++ $(INSTALL_DATA) omalloc.h $(DESTDIR)$(includedir)
++ $(INSTALL_DATA) omlimits.h $(DESTDIR)$(includedir)
++ $(INSTALL_DATA) mylimits.h $(DESTDIR)$(includedir)
+
+ install_all: install libomalloc_p.a
+ $(INSTALL_DATA) libomalloc_p.a $(libdir)
diff --cc debian/patches/0003-add-working-all-target-to-Makefile.in.patch
index 55bd938,0000000..258fe95
mode 100644,000000..100644
--- a/debian/patches/0003-add-working-all-target-to-Makefile.in.patch
+++ b/debian/patches/0003-add-working-all-target-to-Makefile.in.patch
@@@ -1,56 -1,0 +1,56 @@@
- From 3f2e4c8db622992d1b99da8f3d470899340b2c2c Mon Sep 17 00:00:00 2001
++From 9c16b70de368bf955f52372a4a6604aa8275dac1 Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Thu, 16 Feb 2012 11:07:25 +0100
+Subject: add working 'all' target to Makefile.in
+
+now 'make\ {all,install}' works as usual and expected
+---
+ Makefile.in | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 0d6db8f..f2eaa65 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -24,8 +24,12 @@ GUNZIP = @GUNZIP@
+
+ ##############################################################
+ # default target
+-${SINGULAR}:
+- ${MAKE} install
++all:
++ @ for SUBDIR in ${BUILD1_SUBDIRS}; \
++ do \
++ echo ${MAKE} all in $${SUBDIR}; \
++ ${MAKE} -C $$SUBDIR || exit 1; \
++ done
+
+ ##############################################################
+ # general targets
+@@ -34,7 +38,7 @@ ${SINGULAR}:
+
+ TEXINFO_TEX_FILES = epsf.tex texinfo.tex txi-cs.tex txi-de.tex txi-no.tex
+ TEXINFO_TEX_DIR = Texinfo/doc
+-all:
++original_all:
+ echo For everybody who did not read the README: use make install
+ exit 1
+
+@@ -42,7 +46,7 @@ install install_all:
+ @ for SUBDIR in ${BUILD1_SUBDIRS}; \
+ do \
+ echo ${MAKE} $@ in $${SUBDIR}; \
+- (cd $${SUBDIR} && ${MAKE} $@ ) || exit 1;\
++ ${MAKE} -C $$SUBDIR $@ || exit 1 ;\
+ (if test "$${SUBDIR}" = Texinfo && test -d doc; then \
+ for FILE in ${TEXINFO_TEX_FILES}; \
+ do \
+@@ -62,7 +66,7 @@ install-nolns:
+ @ for SUBDIR in ${BUILD1_SUBDIRS}; \
+ do \
+ echo ${MAKE} $@ in $${SUBDIR}; \
+- (cd $${SUBDIR} && ${MAKE} $@ ) || exit 1;\
++ ${MAKE} -C $$SUBDIR $@ ;\
+ (if test "$${SUBDIR}" = Texinfo && test -d doc; then \
+ for FILE in ${TEXINFO_TEX_FILES}; \
+ do \
diff --cc debian/patches/0004-miscellaneous-Makefile.in-patches.patch
index 9a6b535,0000000..5681842
mode 100644,000000..100644
--- a/debian/patches/0004-miscellaneous-Makefile.in-patches.patch
+++ b/debian/patches/0004-miscellaneous-Makefile.in-patches.patch
@@@ -1,291 -1,0 +1,291 @@@
- From 94e0ec4226ea3d90888384d62e52bd3cba253894 Mon Sep 17 00:00:00 2001
++From 98eaaa4e9169da152051fc8adb97230d4a045a35 Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Thu, 16 Feb 2012 12:37:00 +0100
+Subject: miscellaneous Makefile.in patches
+
+ - fix flags (mostly search paths)
+ - repair default and install targets
+ - remove dependency on mod2.h in kernel. "make depend" works fine
+---
+ Singular/Makefile.in | 48 ++++++++++++++++++++++++++++++------------------
+ emacs/Makefile.in | 5 ++++-
+ factory/GNUmakefile.in | 18 ++++++++++--------
+ kernel/Makefile.in | 10 +++++-----
+ omalloc/Makefile.in | 6 +++---
+ 5 files changed, 52 insertions(+), 35 deletions(-)
+
+diff --git a/Singular/Makefile.in b/Singular/Makefile.in
+index 3e02df1..3275701 100644
+--- a/Singular/Makefile.in
++++ b/Singular/Makefile.in
+@@ -85,7 +85,7 @@ endif
+ DEFS = -DNDEBUG -DOM_NDEBUG -D at SING_UNAME@ @DEFS@
+ LDFLAGS2 = @LDFLAGS@
+ ifneq ($(SINGUNAME),ix86-Win)
+-LDFLAGS = -L at prefix@/kernel -L../kernel -lkernel @LDFLAGS@
++LDFLAGS = -L at prefix@/kernel -L../kernel -L../omalloc -L../libfac -L../factory -lkernel @LDFLAGS@
+ LDFLAGSG = -L at prefix@/kernel -L../kernel -lkernel_g @LD_DYN_FLAGS1@ @LDFLAGS@
+ LDFLAGSP = -L at prefix@/kernel -L../kernel -lkernel_p @LD_DYN_FLAGS1@ @LDFLAGS@
+ else
+@@ -358,9 +358,9 @@ GFTABLES = $(wildcard LIB/gftables/[1-9]*)
+ fi
+
+ .cc.o:
+- ${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} -c $<
++ ${CXX} -fPIC ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} -c $<
+ .c.o:
+- ${CC} ${CFLAGS} ${CPPFLAGS} ${DEFS} -c $<
++ ${CC} -fPIC ${CFLAGS} ${CPPFLAGS} ${DEFS} -c $<
+
+ %.dl_o : %.cc
+ ${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} ${SFLAGS} -c $< -o $@
+@@ -382,11 +382,13 @@ Singular${S_EXT}: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
+ tesths.cc iparith.o mpsr_Tok.o claptmpl.o\
+ ${OBJS} ${LDFLAGS} ${LIBS} ../kernel/mmalloc.o
+
+-libsingular: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
+- iparith.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS)
++libsingular: libsingular.${SO_SUFFIX}
++
++libsingular.${SO_SUFFIX}: version.h $(WIN_LIBS) scanner.cc ${OBJS} \
++ iparith.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS) tesths.o
+ $(LIBSINGULAR_LD) ${SLDFLAGS} ${LIBSINGULAR_FLAGS} -o libsingular.${SO_SUFFIX} \
+- iparith.o mpsr_Tok.o claptmpl.o \
+- ${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L${libdir} ${LIBSINGULAR_LIBS}
++ tesths.o iparith.o mpsr_Tok.o claptmpl.o \
++ ${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L../omalloc -L${libdir} ${LIBSINGULAR_LIBS}
+
+ libsingular.a: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
+ iparith.o libparse.cc claptmpl.o mpsr_Tok.o
+@@ -422,13 +424,16 @@ iparith.inc: gentable.cc grammar.h tok.h table.h mod2.h
+ ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} gentable.cc \
+ -o gentable1
+ ./gentable1
+- /bin/rm -f gentable1 gentable1.exe
++ # /bin/rm -f gentable1 gentable1.exe
+
+ mpsr_Tok.inc: gentable2.cc grammar.h tok.h table.h mod2.h
+ ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} gentable2.cc \
+ -o gentable2
+ ./gentable2
+- /bin/rm -f gentable2 gentable2.exe
++ # /bin/rm -f gentable2 gentable2.exe
++ #
++ # FIXME: the above doesnt work.
++ touch $@
+
+
+ version.h: ${SOURCES} ${HEADERS} Makefile.in mod2.h.in \
+@@ -468,17 +473,17 @@ TSingular: mod2.h feOpt.cc version.h emacs.cc \
+ feOpt.o: feOpt.inc feOptES.inc feOptTS.inc
+ extra.o: feOpt.inc
+
+-feOpt.inc: feOpt.cc mod2.h
++feOpt.inc: feOpt.cc |mod2.h
+ $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX ${CPPFLAGS} feOpt.cc -o feOpt
+ ./feOpt
+ /bin/rm -f feOpt feOpt.exe
+
+-feOptES.inc: feOpt.cc mod2.h
++feOptES.inc: feOpt.cc |mod2.h
+ $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX -DESINGULAR -I../kernel feOpt.cc -o feOptES
+ ./feOptES
+ rm -f feOptES feOptES.exe
+
+-feOptTS.inc: feOpt.cc mod2.h
++feOptTS.inc: feOpt.cc |mod2.h
+ $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX -DTSINGULAR -I../kernel feOpt.cc -o feOptTS
+ ./feOptTS
+ rm -f feOptTS feOptTS.exe
+@@ -549,11 +554,11 @@ endif
+ ##
+ ## install targets
+ ##
+-install: all installbin installslib
++install: all installbin installslib install-libsingular
+
+ install_all: install
+
+-install-nolns: all installbin-nolns installslib-nolns
++install-ln: all installbin installslib-ln
+
+ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
+ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
+@@ -561,6 +566,12 @@ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
+ -for file in *.so; do \
+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${bindir}; \
+ done
++ ${MKINSTALLDIRS} $(DESTDIR)${install_bindir}
++ ${MKINSTALLDIRS} $(DESTDIR)${libdir}
++ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${SINGULAR}
++ for file in *.so; do \
++ ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
++ done
+ ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} $(DESTDIR)${bindir}
+ ${INSTALL_PROGRAM} ESingular TSingular $(DESTDIR)${bindir}
+ ${INSTALL_PROGRAM} surfex $(DESTDIR)${bindir}
+@@ -571,10 +582,10 @@ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
+ installbin-nolns: installbin
+ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${install_bindir}/Singular${EXEC_EXT};
+
+-installslib: LIB
++installslib-ln: LIB
+ test -r ${slibdir} || ${LN_S} `pwd`/LIB ${slibdir}
+
+-installslib-nolns: LIB
++installslib: LIB
+ ${MKINSTALLDIRS} $(DESTDIR)${slibdir}
+ for file in `pwd`/LIB/*.lib; do \
+ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
+@@ -584,7 +595,7 @@ installslib-nolns: LIB
+ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
+ done
+
+-install-libsingular: libsingular installslib-nolns
++install-libsingular: libsingular installslib
+ ${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
+ for file in *.$(SO_SUFFIX); do \
+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
+@@ -607,11 +618,12 @@ uninstallbin:
+ mostlyclean:
+ -rm -f Singular Singular-static Singularg Singularp libparse feOpt*.inc
+ -rm -f *.o *.og core *.op *.so* *.dl_o*
+- -rm -f ESingular* TSingular*
++ -rm -f ESingular* TSingular* libsingular
+
+ clean: mostlyclean
+ -rm -f *.bak *.d *.dd depend
+ -rm -f ${slibdir}
++ -rm -f gentable1 gentable2
+
+ distclean: clean
+ -rm -f iparith.inc mpsr_Tok.inc stamp.h
+diff --git a/emacs/Makefile.in b/emacs/Makefile.in
+index 86ba445..47c57e1 100644
+--- a/emacs/Makefile.in
++++ b/emacs/Makefile.in
+@@ -42,9 +42,12 @@ lib-cmpl.el: ${prefix}/Singular/Makefile lib.pl
+ (cd ${prefix}/Singular;${MAKE} --no-print-directory -s -f Makefile echoLIBS) > lib-temp
+ ${PERL} lib.pl -s ${singulardir} `cat lib-temp` > lib-cmpl.el
+
+-clean mostlyclean distclean:
++clean mostlyclean:
+ rm -f cmd-cmpl.el hlp-cmpl.el lib-cmpl.el ex-cmpl.el
+
++distclean: mostlyclean
++ rm -f Makefile
++
+ install-sharedist: all
+ ${MKINSTALLDIRS} ${emacsdir}
+ ${INSTALL_DATA} cmd-cmpl.el ${emacsdir}
+diff --git a/factory/GNUmakefile.in b/factory/GNUmakefile.in
+index 85d866b..ad740c9 100644
+--- a/factory/GNUmakefile.in
++++ b/factory/GNUmakefile.in
+@@ -384,24 +384,24 @@ distfiles := \
+ #
+
+ # how to create library objects
+-%.o: %.cc config.h factoryconf.h
++%.o: %.cc config.h |factoryconf.h
+ $(CXX) -c $< $(LIBCXXFLAGS) -o $@
+ %.o: %.c config.h
+ $(CC) -c $< $(LIBCFLAGS) -o $@
+ # the debug version:
+-%.og: %.cc config.h factoryconf.h
++%.og: %.cc config.h |factoryconf.h
+ $(CXX) -g -c $< $(LIBCGGFLAGS) -o $@
+ # the profiling version:
+-%.op: %.cc config.h factoryconf.h
++%.op: %.cc config.h |factoryconf.h
+ $(CXX) -O -pg -c $< $(LIBCGGFLAGS) -o $@
+
+ # how to create dependency files. To avoid broken dependency files
+ # (which in turn break this GNUmakefile) we first generate them in
+ # a temporary file which we then move to the destination file.
+-%.dtmp: %.cc factoryconf.h config.h
++%.dtmp: %.cc |factoryconf.h config.h
+ echo $*.d "\\" > $@
+ $(CXX) -MM $< $(DEPCXXFLAGS) >> $@
+-%.dtmp: %.c factoryconf.h config.h
++%.dtmp: %.c |factoryconf.h config.h
+ echo $*.d "\\" > $@
+ $(CXX) -MM $< $(DEPCXXFLAGS) >> $@
+ %.dtmp: %.template
+@@ -681,8 +681,10 @@ $(srcdir)/configure: configure.in
+ # seems gmake needs at least a trivial command. otherwise all
+ # files which depend on config.h will be remade even if congig.h
+ # did not change.
+-config.h: stamp-h
+- @:
++#
++# WTF?
++#config.h: stamp-h
++# @:
+
+ stamp-h: config.h.in config.status
+ CONFIG_FILES= CONFIG_HEADERS=config.h ./config.status
+@@ -695,7 +697,7 @@ config.status: configure
+ ./config.status --recheck
+
+ # create cf_gmp.h
+-cf_gmp.h: GNUmakefile gen_cf_gmp.template
++cf_gmp.h: gen_cf_gmp.template
+ echo "#!/bin/sh" >gen_cf_gmp.sh
+ echo "GMP_H_T=\"`$(CXX) $(LIBCXXFLAGS) -M gen_cf_gmp.cc|grep gmp.h` \"" >>gen_cf_gmp.sh
+ cat gen_cf_gmp.template >>gen_cf_gmp.sh
+diff --git a/kernel/Makefile.in b/kernel/Makefile.in
+index 6f58083..78d2b07 100644
+--- a/kernel/Makefile.in
++++ b/kernel/Makefile.in
+@@ -253,12 +253,12 @@ p_Procs_Dynamic.o p_Procs_Lib.o p_Procs_Dynamic.og p_Procs_Lib.og\
+ p_Procs_Dynamic.inc p_Procs_Lib.inc: p_Procs_Dynamic.h
+
+ # here is how p_Procs_[Static|Dynamic].inc is generated
+-p_Procs_Static.inc: p_Procs_Generate.cc p_Procs_Impl.h |mod2.h
++p_Procs_Static.inc: p_Procs_Generate.cc p_Procs_Impl.h
+ $(CXX) $(CPPFLAGS) -g -Dp_Procs_Static p_Procs_Generate.cc -o p_Procs_Static
+ ./p_Procs_Static > p_Procs_Static.xx && mv p_Procs_Static.xx p_Procs_Static.inc
+ -rm -f p_Procs_Static p_Procs_Static.exe
+
+-p_Procs_Dynamic.inc: p_Procs_Generate.cc p_Procs_Impl.h |mod2.h
++p_Procs_Dynamic.inc: p_Procs_Generate.cc p_Procs_Impl.h
+ $(CXX) $(CPPFLAGS) -g -Dp_Procs_Dynamic p_Procs_Generate.cc -o p_Procs_Dynamic
+ ./p_Procs_Dynamic > p_Procs_Dynamic.xx && mv p_Procs_Dynamic.xx p_Procs_Dynamic.inc
+ -rm -f p_Procs_Dynamic p_Procs_Dynamic.exe
+@@ -439,15 +439,15 @@ libkernel_p.a: ${OBJP} ${DL_LIBSP} ${OBJSP2}
+ ## dependencies
+ ##
+
+-%.dd: %.cc mod2.h
++%.dd: %.cc
+ echo $(@:.dd=.og) $(@:.dd=.op) $(@:.dd=.dl_o) $(@:.dd=.dl_og) $(@:.dd=.dl_op)" " \\ > $@
+ $(CXXM) -DGENTABLE ${CPPFLAGS} ${DEFSG} $< >> $@
+
+-%.d: %.c mod2.h
++%.d: %.c
+ echo $(@:.d=.og) $(@:.d=.op) " " \\ > $@
+ $(CCM) ${CPPFLAGS} ${DEFSG} $< >> $@
+
+-depend: $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(CSOURCES:.c=.d) mod2.h
++depend: $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(CSOURCES:.c=.d)
+ cat *.d *.dd >depend
+
+ ifeq (depend,$(wildcard depend))
+diff --git a/omalloc/Makefile.in b/omalloc/Makefile.in
+index 8661ca2..1dd2e36 100644
+--- a/omalloc/Makefile.in
++++ b/omalloc/Makefile.in
+@@ -180,9 +180,9 @@ configure: configure.in
+ ##
+ install-nolns: install
+
+-install-libsingular:
+- $(MKINSTALLDIRS) $(includedir)/singular
+- $(INSTALL) omalloc.h $(includedir)/singular
++#install-libsingular:
++# $(MKINSTALLDIRS) $(includedir)/singular
++# $(INSTALL) omalloc.h $(includedir)/singular
+
+ install install-libsingular: all
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
diff --cc debian/patches/0005-assert-needs-to-be-defined-after-include-assert.h.patch
index be9bb8b,0000000..c6ace0b
mode 100644,000000..100644
--- a/debian/patches/0005-assert-needs-to-be-defined-after-include-assert.h.patch
+++ b/debian/patches/0005-assert-needs-to-be-defined-after-include-assert.h.patch
@@@ -1,24 -1,0 +1,24 @@@
- From 6f5575cb635bf80edef4add40147481d9784944b Mon Sep 17 00:00:00 2001
++From 744d1ef26da73f82a498f2bf816ae7e729477be3 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?=
+ =?UTF-8?q?=20"assert.h",=0Aalso=20if=20-Ifactory=20is=20used.?=
+
+---
+ factory/assert.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/factory/assert.h b/factory/assert.h
+index 3dd036b..d2933a1 100644
+--- a/factory/assert.h
++++ b/factory/assert.h
+@@ -128,3 +128,9 @@ extern "C" {
+ #define PVIRT_CHARCC(msg) = 0
+ #endif /* NOASSERT */
+ /* }}} */
++
++
++//assert is expected to be available after '#include "assert.h"'
++#ifndef assert
++# define assert(a)
++#endif
diff --cc debian/patches/0006-keep-mod2.h-in-Singular.patch
index f27f0a6,0000000..b029879
mode 100644,000000..100644
--- a/debian/patches/0006-keep-mod2.h-in-Singular.patch
+++ b/debian/patches/0006-keep-mod2.h-in-Singular.patch
@@@ -1,2489 -1,0 +1,2475 @@@
- From f56daa87a12ef6ae3e12bacf255b1e086dbc9cb3 Mon Sep 17 00:00:00 2001
++From c6dc349d0b2a7bdda80c7d508cf5792c1402d126 Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Wed, 22 Feb 2012 11:18:38 +0100
+Subject: keep mod2.h in Singular/
+
+don't copy mod2.h generated in Singular/ to kernel/
+to avoid time stamp issues
+---
+ Singular/Makefile.in | 2 +-
+ Singular/Minor.cc | 2 +-
+ Singular/MinorInterface.cc | 2 +-
+ Singular/MinorProcessor.cc | 2 +-
+ Singular/attrib.cc | 2 +-
+ Singular/calcSVD.cc | 2 +-
+ Singular/claptmpl.cc | 2 +-
+ Singular/cntrlc.cc | 2 +-
+ Singular/configure | 1 -
+ Singular/configure.in | 1 -
+ Singular/eigenval_ip.cc | 2 +-
+ Singular/emacs.cc | 2 +-
+ Singular/extra.cc | 2 +-
+ Singular/feOpt.cc | 2 +-
+ Singular/fehelp.cc | 2 +-
+ Singular/fglm.cc | 2 +-
+ Singular/gms.cc | 2 +-
+ Singular/grammar.cc | 2 +-
+ Singular/grammar.y | 2 +-
+ Singular/interpolation.cc | 2 +-
+ Singular/iparith.cc | 2 +-
+ Singular/ipassign.cc | 2 +-
+ Singular/ipconv.cc | 2 +-
+ Singular/ipid.cc | 2 +-
+ Singular/iplib.cc | 2 +-
+ Singular/ipprint.cc | 2 +-
+ Singular/ipshell.cc | 2 +-
+ Singular/janet.cc | 2 +-
+ Singular/libparse.l | 2 +-
+ Singular/lists.cc | 2 +-
+ Singular/maps_ip.cc | 2 +-
+ Singular/minpoly.cc | 2 +-
+ Singular/misc_ip.cc | 2 +-
+ Singular/mpsr_Error.cc | 2 +-
+ Singular/mpsr_Get.cc | 2 +-
+ Singular/mpsr_GetMisc.cc | 2 +-
+ Singular/mpsr_GetPoly.cc | 2 +-
+ Singular/mpsr_Put.cc | 2 +-
+ Singular/mpsr_PutPoly.cc | 2 +-
+ Singular/mpsr_Tok.cc | 2 +-
+ Singular/mpsr_sl.cc | 2 +-
+ Singular/ndbm.cc | 2 +-
+ Singular/pcv.cc | 2 +-
+ Singular/pipeLink.cc | 2 +-
+ Singular/scanner.cc | 2 +-
+ Singular/scanner.l | 2 +-
+ Singular/sdb.cc | 2 +-
+ Singular/silink.cc | 2 +-
+ Singular/sing_dbm.cc | 2 +-
+ Singular/sing_win.cc | 2 +-
+ Singular/slInit_Dynamic.cc | 2 +-
+ Singular/slInit_Static.cc | 2 +-
+ Singular/ssiLink.cc | 2 +-
+ Singular/subexpr.cc | 2 +-
+ Singular/tesths.cc | 2 +-
+ Singular/walk.cc | 2 +-
+ Singular/walk_ip.cc | 2 +-
+ Singular/wrapper.cc | 2 +-
+ kernel/F4.cc | 2 +-
+ kernel/F5cData.cc | 2 +-
+ kernel/F5cLists.cc | 2 +-
+ kernel/GMPrat.cc | 2 +-
+ kernel/Number.h | 2 +-
+ kernel/Poly.h | 2 +-
+ kernel/PowerSeries.h | 2 +-
+ kernel/clapconv.cc | 2 +-
+ kernel/clapsing.cc | 2 +-
+ kernel/dError.c | 2 +-
+ kernel/digitech.cc | 2 +-
+ kernel/digitech.h | 2 +-
+ kernel/eigenval.cc | 2 +-
+ kernel/f5c.cc | 2 +-
+ kernel/f5data.cc | 2 +-
+ kernel/f5gb.cc | 2 +-
+ kernel/f5lists.cc | 2 +-
+ kernel/fast_maps.cc | 2 +-
+ kernel/fast_mult.cc | 2 +-
+ kernel/fast_mult.h | 2 +-
+ kernel/feResource.cc | 2 +-
+ kernel/febase.cc | 2 +-
+ kernel/fegetopt.c | 2 +-
+ kernel/feread.cc | 2 +-
+ kernel/fereadl.c | 2 +-
+ kernel/ffields.cc | 2 +-
+ kernel/fglmcomb.cc | 2 +-
+ kernel/fglmgauss.cc | 2 +-
+ kernel/fglmhom.cc | 2 +-
+ kernel/fglmvec.cc | 2 +-
+ kernel/fglmzero.cc | 2 +-
- kernel/gfan.cc | 2 +-
+ kernel/gnumpc.cc | 2 +-
+ kernel/gnumpfl.cc | 2 +-
+ kernel/gr_kstd2.cc | 2 +-
+ kernel/gring.cc | 2 +-
+ kernel/hdegree.cc | 2 +-
+ kernel/hilb.cc | 2 +-
+ kernel/hutil.cc | 2 +-
+ kernel/ideals.cc | 2 +-
+ kernel/int64vec.cc | 2 +-
+ kernel/intvec.cc | 2 +-
+ kernel/kbuckets.cc | 2 +-
+ kernel/khstd.cc | 2 +-
+ kernel/kspoly.cc | 2 +-
+ kernel/kstd1.cc | 2 +-
+ kernel/kstd2.cc | 2 +-
+ kernel/kstdfac.cc | 2 +-
+ kernel/kutil.cc | 2 +-
+ kernel/linearAlgebra.cc | 2 +-
+ kernel/longalg.cc | 2 +-
+ kernel/longrat.cc | 2 +-
+ kernel/longrat0.cc | 2 +-
+ kernel/longtrans.cc | 2 +-
+ kernel/lplist.cc | 2 +-
+ kernel/maps.cc | 2 +-
+ kernel/matpol.cc | 2 +-
+ kernel/misc.cc | 2 +-
+ kernel/mmalloc.cc | 2 +-
+ kernel/mmstd.c | 2 +-
+ kernel/mod_raw.cc | 2 +-
+ kernel/modulop.cc | 2 +-
+ kernel/mpr_base.cc | 2 +-
+ kernel/mpr_complex.cc | 2 +-
+ kernel/mpr_inout.cc | 2 +-
+ kernel/mpr_numeric.cc | 2 +-
+ kernel/multicnt.cc | 2 +-
+ kernel/ncSACache.cc | 2 +-
+ kernel/ncSAFormula.cc | 2 +-
+ kernel/ncSAMult.cc | 2 +-
+ kernel/npolygon.cc | 2 +-
+ kernel/numbers.cc | 2 +-
+ kernel/pDebug.cc | 2 +-
+ kernel/pInline0.cc | 2 +-
+ kernel/pInline1.cc | 2 +-
+ kernel/pInline2.cc | 2 +-
+ kernel/pShallowCopyDelete.cc | 2 +-
+ kernel/p_Mult_q.cc | 2 +-
+ kernel/p_Mult_q.h | 2 +-
+ kernel/p_Procs_Dynamic.cc | 2 +-
+ kernel/p_Procs_Generate.cc | 2 +-
+ kernel/p_Procs_Lib.cc | 2 +-
+ kernel/p_Procs_Static.cc | 2 +-
+ kernel/p_polys.cc | 2 +-
+ kernel/page.c | 2 +-
+ kernel/polys-impl.cc | 2 +-
+ kernel/polys.cc | 2 +-
+ kernel/polys0.cc | 2 +-
+ kernel/polys1.cc | 2 +-
+ kernel/prCopy.cc | 2 +-
+ kernel/ratgring.cc | 2 +-
+ kernel/ring.cc | 2 +-
+ kernel/ringgb.cc | 2 +-
+ kernel/ringgb.h | 2 +-
+ kernel/rintegers.cc | 2 +-
+ kernel/rmodulo2m.cc | 2 +-
+ kernel/rmodulon.cc | 2 +-
+ kernel/sbuckets.cc | 2 +-
+ kernel/sca.cc | 2 +-
+ kernel/semic.cc | 2 +-
+ kernel/shiftgb.cc | 2 +-
+ kernel/shortfl.cc | 2 +-
+ kernel/sparsmat.cc | 2 +-
+ kernel/spectrum.cc | 2 +-
+ kernel/splist.cc | 2 +-
+ kernel/summator.cc | 2 +-
+ kernel/syz.cc | 2 +-
+ kernel/syz0.cc | 2 +-
+ kernel/syz1.cc | 2 +-
+ kernel/syz2.cc | 2 +-
+ kernel/syz3.cc | 2 +-
+ kernel/tgb.cc | 2 +-
+ kernel/tgbgauss.cc | 2 +-
+ kernel/tgbgauss.h | 2 +-
+ kernel/timer.cc | 2 +-
+ kernel/tmult.cc | 2 +-
+ kernel/units.cc | 2 +-
+ kernel/walkMain.cc | 2 +-
+ kernel/walkProc.cc | 2 +-
+ kernel/walkSupport.cc | 2 +-
+ kernel/weight.cc | 2 +-
+ kernel/weight0.c | 2 +-
- 180 files changed, 178 insertions(+), 180 deletions(-)
++ 179 files changed, 177 insertions(+), 179 deletions(-)
+
+diff --git a/Singular/Makefile.in b/Singular/Makefile.in
+index 3275701..f1b93ae 100644
+--- a/Singular/Makefile.in
++++ b/Singular/Makefile.in
+@@ -601,7 +601,7 @@ install-libsingular: libsingular installslib
+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
+ done
+ ${INSTALL_PROGRAM} libsingular.h $(DESTDIR)${includedir}
+- for file in subexpr.h tok.h grammar.h ipid.h lists.h ipshell.h attrib.h; do \
++ for file in mod2.h subexpr.h tok.h grammar.h ipid.h lists.h ipshell.h attrib.h; do \
+ sed -e "s:<kernel/:<singular/:" < $$file |sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" >$(DESTDIR)${includedir}/singular/$$file ;\
+ done
+
+diff --git a/Singular/Minor.cc b/Singular/Minor.cc
+index 402d7e6..4e358c5 100644
+--- a/Singular/Minor.cc
++++ b/Singular/Minor.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/polys.h>
+ #include <Minor.h>
+diff --git a/Singular/MinorInterface.cc b/Singular/MinorInterface.cc
+index c79f694..508f979 100644
+--- a/Singular/MinorInterface.cc
++++ b/Singular/MinorInterface.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/polys.h>
+ #include <kernel/ideals.h>
+diff --git a/Singular/MinorProcessor.cc b/Singular/MinorProcessor.cc
+index 1c08156..6ff81aa 100644
+--- a/Singular/MinorProcessor.cc
++++ b/Singular/MinorProcessor.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/polys.h>
+ #include <MinorProcessor.h>
+diff --git a/Singular/attrib.cc b/Singular/attrib.cc
+index 1f016ef..bbef31e 100644
+--- a/Singular/attrib.cc
++++ b/Singular/attrib.cc
+@@ -12,7 +12,7 @@
+ #include <ctype.h>
+ #include <unistd.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/options.h>
+ #include <Singular/tok.h>
+diff --git a/Singular/calcSVD.cc b/Singular/calcSVD.cc
+index bf80b3c..1e889dd 100644
+--- a/Singular/calcSVD.cc
++++ b/Singular/calcSVD.cc
+@@ -1,5 +1,5 @@
+ #include <stdio.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_SVD
+
+diff --git a/Singular/claptmpl.cc b/Singular/claptmpl.cc
+index 0fa6109..512b353 100644
+--- a/Singular/claptmpl.cc
++++ b/Singular/claptmpl.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT - instantiation of all templates
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ //#include <vector>
+ //using namespace std;
+ #ifdef HAVE_FACTORY
+diff --git a/Singular/cntrlc.cc b/Singular/cntrlc.cc
+index 374d05b..ed1a67e 100644
+--- a/Singular/cntrlc.cc
++++ b/Singular/cntrlc.cc
+@@ -16,7 +16,7 @@
+ #include <signal.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+ #include <Singular/tok.h>
+ #include <Singular/ipshell.h>
+diff --git a/Singular/configure b/Singular/configure
+index adc70b4..3a3b6a5 100755
+--- a/Singular/configure
++++ b/Singular/configure
+@@ -10416,4 +10416,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+-
+diff --git a/Singular/configure.in b/Singular/configure.in
+index a230b0f..c190733 100644
+--- a/Singular/configure.in
++++ b/Singular/configure.in
+@@ -1505,5 +1505,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 5f53709..b9f6030 100644
+--- a/Singular/eigenval_ip.cc
++++ b/Singular/eigenval_ip.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT: eigenvalues of constant square matrices
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_EIGENVAL
+
+diff --git a/Singular/emacs.cc b/Singular/emacs.cc
+index 4c800d0..7ef7227 100644
+--- a/Singular/emacs.cc
++++ b/Singular/emacs.cc
+@@ -17,7 +17,7 @@
+ #ifdef ix86_Win
+ #include <windows.h>
+ #endif
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/version.h>
+ #include <omalloc/omalloc.h>
+
+diff --git a/Singular/extra.cc b/Singular/extra.cc
+index b984faf..cbceeb2 100644
+--- a/Singular/extra.cc
++++ b/Singular/extra.cc
+@@ -12,7 +12,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <signal.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <misc_ip.h>
+ #include <blackbox.h>
+ #include <newstruct.h>
+diff --git a/Singular/feOpt.cc b/Singular/feOpt.cc
+index 81fca1c..166eb2a 100644
+--- a/Singular/feOpt.cc
++++ b/Singular/feOpt.cc
+@@ -7,7 +7,7 @@
+
+ #include <string.h>
+ #include <stdlib.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/feOpt.h>
+ #if !defined(GENERATE_OPTION_INDEX) && !defined(ESINGULAR) && !defined(TSINGULAR)
+ #include <kernel/options.h>
+diff --git a/Singular/fehelp.cc b/Singular/fehelp.cc
+index 106c7a5..310c44b 100644
+--- a/Singular/fehelp.cc
++++ b/Singular/fehelp.cc
+@@ -12,7 +12,7 @@
+ #include <stdlib.h>
+ #include <time.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <Singular/tok.h>
+ #include <omalloc/omalloc.h>
+diff --git a/Singular/fglm.cc b/Singular/fglm.cc
+index cecd356..4c09f8f 100644
+--- a/Singular/fglm.cc
++++ b/Singular/fglm.cc
+@@ -15,7 +15,7 @@
+ * lying in a 0-dimensional ideal.
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_FACTORY
+ #include <Singular/tok.h>
+diff --git a/Singular/gms.cc b/Singular/gms.cc
+index e204043..dc9060e 100644
+--- a/Singular/gms.cc
++++ b/Singular/gms.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT: Gauss-Manin system normal form
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_GMS
+
+diff --git a/Singular/grammar.cc b/Singular/grammar.cc
+index b8affd1..5e37495 100644
+--- a/Singular/grammar.cc
++++ b/Singular/grammar.cc
+@@ -76,7 +76,7 @@
+ #include <stdarg.h>
+ #include <string.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <omalloc/omalloc.h>
+ #include <Singular/tok.h>
+diff --git a/Singular/grammar.y b/Singular/grammar.y
+index 0ef2c4d..f3da01b 100644
+--- a/Singular/grammar.y
++++ b/Singular/grammar.y
+@@ -12,7 +12,7 @@
+ #include <stdarg.h>
+ #include <string.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <omalloc/omalloc.h>
+ #include <Singular/tok.h>
+diff --git a/Singular/interpolation.cc b/Singular/interpolation.cc
+index 03d5459..da89864 100644
+--- a/Singular/interpolation.cc
++++ b/Singular/interpolation.cc
+@@ -2,7 +2,7 @@
+ * Computer Algebra System SINGULAR *
+ ****************************************/
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <kernel/febase.h>
+ #include <kernel/ideals.h>
+diff --git a/Singular/iparith.cc b/Singular/iparith.cc
+index 92b5c15..c728f36 100644
+--- a/Singular/iparith.cc
++++ b/Singular/iparith.cc
+@@ -12,7 +12,7 @@
+ #include <time.h>
+ #include <unistd.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <kernel/options.h>
+ #include <Singular/ipid.h>
+diff --git a/Singular/ipassign.cc b/Singular/ipassign.cc
+index 34ea0da..266f22b 100644
+--- a/Singular/ipassign.cc
++++ b/Singular/ipassign.cc
+@@ -11,7 +11,7 @@
+ #include <string.h>
+ #include <ctype.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <kernel/options.h>
+ #include <Singular/ipid.h>
+diff --git a/Singular/ipconv.cc b/Singular/ipconv.cc
+index a9a7696..431141d 100644
+--- a/Singular/ipconv.cc
++++ b/Singular/ipconv.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT: automatic type conversions
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <Singular/ipid.h>
+ #include <kernel/bigintmat.h>
+diff --git a/Singular/ipid.cc b/Singular/ipid.cc
+index 175f2b7..71cc0fe 100644
+--- a/Singular/ipid.cc
++++ b/Singular/ipid.cc
+@@ -7,7 +7,7 @@
+
+ #include <string.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/static.h>
+ #include <omalloc/omalloc.h>
+ #include <Singular/tok.h>
+diff --git a/Singular/iplib.cc b/Singular/iplib.cc
+index e22af65..569961d 100644
+--- a/Singular/iplib.cc
++++ b/Singular/iplib.cc
+@@ -11,7 +11,7 @@
+ #include <ctype.h>
+ #include <sys/stat.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/static.h>
+ #include <Singular/tok.h>
+ #include <kernel/options.h>
+diff --git a/Singular/ipprint.cc b/Singular/ipprint.cc
+index ede2210..d8f3916 100644
+--- a/Singular/ipprint.cc
++++ b/Singular/ipprint.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT: interpreter: printing
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <Singular/ipid.h>
+ #include <omalloc/omalloc.h>
+diff --git a/Singular/ipshell.cc b/Singular/ipshell.cc
+index b716caa..6d0a25d 100644
+--- a/Singular/ipshell.cc
++++ b/Singular/ipshell.cc
+@@ -11,7 +11,7 @@
+ #include <ctype.h>
+ #include <math.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <kernel/options.h>
+ #include <Singular/ipid.h>
+diff --git a/Singular/janet.cc b/Singular/janet.cc
+index d381a46..a0d24ba 100755
+--- a/Singular/janet.cc
++++ b/Singular/janet.cc
+@@ -3,7 +3,7 @@
+ #include <string.h>
+ #include <time.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/polys.h>
+ #include <kernel/numbers.h>
+diff --git a/Singular/libparse.l b/Singular/libparse.l
+index 645fdae..f05b329 100644
+--- a/Singular/libparse.l
++++ b/Singular/libparse.l
+@@ -6,7 +6,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <ctype.h>
+-#include <kernel/mod2.h>
++#include "mod2.h"
+ #ifdef STANDALONE_PARSER
+ #include <Singular/utils.h>
+ #define HAVE_LIBPARSER
+diff --git a/Singular/lists.cc b/Singular/lists.cc
+index 15daae1..d3fff37 100644
+--- a/Singular/lists.cc
++++ b/Singular/lists.cc
+@@ -7,7 +7,7 @@
+ // to produce a non-inline version from lists.h
+ #define LISTS_CC
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <kernel/febase.h>
+ //#include "ipid.h"
+diff --git a/Singular/maps_ip.cc b/Singular/maps_ip.cc
+index 9fe8339..b0670f8 100644
+--- a/Singular/maps_ip.cc
++++ b/Singular/maps_ip.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT - the mapping of polynomials to other rings
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <kernel/febase.h>
+ #include <kernel/polys.h>
+diff --git a/Singular/minpoly.cc b/Singular/minpoly.cc
+index c319099..87bb58e 100644
+--- a/Singular/minpoly.cc
++++ b/Singular/minpoly.cc
+@@ -6,7 +6,7 @@
+
+
+ #include<cmath>
+-#include<Singular/mod2.h>
++#include <Singular/mod2.h>
+ //#include<iomanip>
+
+ #include "minpoly.h"
+diff --git a/Singular/misc_ip.cc b/Singular/misc_ip.cc
+index 343d5ff..ae207b4 100644
+--- a/Singular/misc_ip.cc
++++ b/Singular/misc_ip.cc
+@@ -14,7 +14,7 @@
+ /*****************************************************************************/
+
+ // include header files
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/lists.h>
+ #include <kernel/longrat.h>
+ #include <Singular/misc_ip.h>
+diff --git a/Singular/mpsr_Error.cc b/Singular/mpsr_Error.cc
+index c189743..44a0b28 100644
+--- a/Singular/mpsr_Error.cc
++++ b/Singular/mpsr_Error.cc
+@@ -11,7 +11,7 @@
+ * Change History (most recent first):
+ *
+ ***************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/mpsr_Get.cc b/Singular/mpsr_Get.cc
+index c681b03..3fac95a 100644
+--- a/Singular/mpsr_Get.cc
++++ b/Singular/mpsr_Get.cc
+@@ -12,7 +12,7 @@
+ *
+ ***************************************************************/
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/mpsr_GetMisc.cc b/Singular/mpsr_GetMisc.cc
+index 641b82f..58b536b 100644
+--- a/Singular/mpsr_GetMisc.cc
++++ b/Singular/mpsr_GetMisc.cc
+@@ -12,7 +12,7 @@
+ *
+ ***************************************************************/
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/mpsr_GetPoly.cc b/Singular/mpsr_GetPoly.cc
+index 24bd201..88eef83 100644
+--- a/Singular/mpsr_GetPoly.cc
++++ b/Singular/mpsr_GetPoly.cc
+@@ -10,7 +10,7 @@
+ *
+ *
+ ***************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_MPSR
+ #include "mylimits.h"
+diff --git a/Singular/mpsr_Put.cc b/Singular/mpsr_Put.cc
+index 539e408..449ff9e 100644
+--- a/Singular/mpsr_Put.cc
++++ b/Singular/mpsr_Put.cc
+@@ -13,7 +13,7 @@
+ * Updated putting routines to MP and MPP v1.1
+ *
+ ***************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/mpsr_PutPoly.cc b/Singular/mpsr_PutPoly.cc
+index bcd93f4..bf57ac8 100644
+--- a/Singular/mpsr_PutPoly.cc
++++ b/Singular/mpsr_PutPoly.cc
+@@ -13,7 +13,7 @@
+ * Updated routines to MP and MPP v1.1
+ *
+ ***************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/mpsr_Tok.cc b/Singular/mpsr_Tok.cc
+index a3801f5..a6818df 100644
+--- a/Singular/mpsr_Tok.cc
++++ b/Singular/mpsr_Tok.cc
+@@ -16,7 +16,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/mpsr_sl.cc b/Singular/mpsr_sl.cc
+index 1253e38..5e8f571 100644
+--- a/Singular/mpsr_sl.cc
++++ b/Singular/mpsr_sl.cc
+@@ -8,7 +8,7 @@
+ * Created: 12/00
+ *******************************************************************/
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_MPSR
+
+diff --git a/Singular/ndbm.cc b/Singular/ndbm.cc
+index c45c7df..d278a82 100644
+--- a/Singular/ndbm.cc
++++ b/Singular/ndbm.cc
+@@ -10,7 +10,7 @@
+ //
+ //**************************************************************************/
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #ifdef HAVE_DBM
+ #ifndef HPUX_9
+ #include <strings.h>
+diff --git a/Singular/pcv.cc b/Singular/pcv.cc
+index 0f5091c..d9391f1 100644
+--- a/Singular/pcv.cc
++++ b/Singular/pcv.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT: conversion between polys and coef vectors
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_PCV
+ //#if !defined(HAVE_DYNAMIC_LOADING) || defined(BUILD_MODULE)
+diff --git a/Singular/pipeLink.cc b/Singular/pipeLink.cc
+index 913c88b..47e3b77 100644
+--- a/Singular/pipeLink.cc
++++ b/Singular/pipeLink.cc
+@@ -16,7 +16,7 @@
+ #include <sys/socket.h>
+
+
+-#include "mod2.h"
++#include <Singular/mod2.h>
+
+ #include "tok.h"
+ #include "ipid.h"
+diff --git a/Singular/scanner.cc b/Singular/scanner.cc
+index aa186ce..9847fa1 100644
+--- a/Singular/scanner.cc
++++ b/Singular/scanner.cc
+@@ -560,7 +560,7 @@ char *yytext;
+ #include <stdlib.h>
+ #include <ctype.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+ #include <Singular/tok.h>
+ #include <Singular/stype.h>
+diff --git a/Singular/scanner.l b/Singular/scanner.l
+index 8298e71..b78f242 100644
+--- a/Singular/scanner.l
++++ b/Singular/scanner.l
+@@ -7,7 +7,7 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+
+-#include <kernel/mod2.h>
++#include "mod2.h"
+ #include <omalloc/omalloc.h>
+ #include <Singular/tok.h>
+ #include <Singular/stype.h>
+diff --git a/Singular/sdb.cc b/Singular/sdb.cc
+index ea0011f..be15a91 100644
+--- a/Singular/sdb.cc
++++ b/Singular/sdb.cc
+@@ -7,7 +7,7 @@
+
+ #include <unistd.h> // for unlink,fork,execlp,getpid
+ #include <sys/wait.h> // for wait
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+diff --git a/Singular/silink.cc b/Singular/silink.cc
+index 811923e..91d0044 100644
+--- a/Singular/silink.cc
++++ b/Singular/silink.cc
+@@ -12,7 +12,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+diff --git a/Singular/sing_dbm.cc b/Singular/sing_dbm.cc
+index bcbd993..fe8990d 100644
+--- a/Singular/sing_dbm.cc
++++ b/Singular/sing_dbm.cc
+@@ -12,7 +12,7 @@
+ # include <fcntl.h>
+ # include <errno.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_DBM
+
+diff --git a/Singular/sing_win.cc b/Singular/sing_win.cc
+index 00a7062..30dc60f 100644
+--- a/Singular/sing_win.cc
++++ b/Singular/sing_win.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: Windows specific routines
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #ifdef ix86_Win
+ #include <windows.h>
+ #include <winuser.h>
+diff --git a/Singular/slInit_Dynamic.cc b/Singular/slInit_Dynamic.cc
+index 746dfec..ca8e2bd 100644
+--- a/Singular/slInit_Dynamic.cc
++++ b/Singular/slInit_Dynamic.cc
+@@ -13,7 +13,7 @@
+ * MP link Extension inits
+ *
+ ***************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/silink.h>
+ #include <Singular/slInit.h>
+ #include <kernel/mod_raw.h>
+diff --git a/Singular/slInit_Static.cc b/Singular/slInit_Static.cc
+index 648dd73..ab2d621 100644
+--- a/Singular/slInit_Static.cc
++++ b/Singular/slInit_Static.cc
+@@ -13,7 +13,7 @@
+ * MP link Extension inits
+ *
+ ***************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/silink.h>
+ #include <Singular/slInit.h>
+
+diff --git a/Singular/ssiLink.cc b/Singular/ssiLink.cc
+index 96bac4f..1e5df92 100644
+--- a/Singular/ssiLink.cc
++++ b/Singular/ssiLink.cc
+@@ -22,7 +22,7 @@
+
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ // #include "mod2.h"
+
+ #include <Singular/tok.h>
+diff --git a/Singular/subexpr.cc b/Singular/subexpr.cc
+index c557dbe..87c50bd 100644
+--- a/Singular/subexpr.cc
++++ b/Singular/subexpr.cc
+@@ -11,7 +11,7 @@
+ #include <ctype.h>
+ #include <unistd.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/intvec.h>
+ #include <kernel/bigintmat.h>
+ #include <Singular/tok.h>
+diff --git a/Singular/tesths.cc b/Singular/tesths.cc
+index d68b38e..bc88c8e 100644
+--- a/Singular/tesths.cc
++++ b/Singular/tesths.cc
+@@ -12,7 +12,7 @@
+ #include <stdlib.h>
+ #include <time.h>
+ #include <errno.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <kernel/options.h>
+ #include <Singular/ipshell.h>
+diff --git a/Singular/walk.cc b/Singular/walk.cc
+index 33e602a..0c33eeb 100644
+--- a/Singular/walk.cc
++++ b/Singular/walk.cc
+@@ -45,7 +45,7 @@
+ #include <sys/types.h>
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/intvec.h>
+ #include <Singular/cntrlc.h>
+ #include <kernel/options.h>
+diff --git a/Singular/walk_ip.cc b/Singular/walk_ip.cc
+index b1627f0..8afc077 100644
+--- a/Singular/walk_ip.cc
++++ b/Singular/walk_ip.cc
+@@ -11,7 +11,7 @@
+ #include <ctype.h>
+ #include <math.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/tok.h>
+ #include <kernel/options.h>
+ #include <Singular/ipid.h>
+diff --git a/Singular/wrapper.cc b/Singular/wrapper.cc
+index 07a2e2f..7884e9f 100755
+--- a/Singular/wrapper.cc
++++ b/Singular/wrapper.cc
+@@ -1,5 +1,5 @@
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/febase.h>
+ #include <kernel/polys.h>
+ #include <kernel/kstd1.h>
+diff --git a/kernel/F4.cc b/kernel/F4.cc
+index 93cfedb..d72939c 100644
+--- a/kernel/F4.cc
++++ b/kernel/F4.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/F4.h>
+ #include <kernel/tgb_internal.h>
+ #include <kernel/tgbgauss.h>
+diff --git a/kernel/F5cData.cc b/kernel/F5cData.cc
+index be2021a..384ebc9 100644
+--- a/kernel/F5cData.cc
++++ b/kernel/F5cData.cc
+@@ -9,7 +9,7 @@
+ * these data types is defined.
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_F5C
+ #include <kernel/kutil.h>
+diff --git a/kernel/F5cLists.cc b/kernel/F5cLists.cc
+index daab9db..8922036 100644
+--- a/kernel/F5cLists.cc
++++ b/kernel/F5cLists.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_F5C
+ #include <kernel/kutil.h>
+diff --git a/kernel/GMPrat.cc b/kernel/GMPrat.cc
+index 8d73221..628d90d 100644
+--- a/kernel/GMPrat.cc
++++ b/kernel/GMPrat.cc
+@@ -8,7 +8,7 @@
+
+ #define GMPRAT_CC
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_SPECTRUM
+
+diff --git a/kernel/Number.h b/kernel/Number.h
+index 4428d15..05f52b7 100644
+--- a/kernel/Number.h
++++ b/kernel/Number.h
+@@ -1,7 +1,7 @@
+ #ifndef NUMBERCPP_HEADER
+ #define NUMBERCPP_HEADER
+ #include <boost/intrusive_ptr.hpp>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/numbers.h>
+ #include <kernel/febase.h>
+ #include <kernel/ring.h>
+diff --git a/kernel/Poly.h b/kernel/Poly.h
+index de7d2b9..f2f913a 100644
+--- a/kernel/Poly.h
++++ b/kernel/Poly.h
+@@ -1,6 +1,6 @@
+ #ifndef POLYCPP_HEADER
+ #define POLYCPP_HEADER
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/IIntvec.h>
+ #include <kernel/numbers.h>
+ #include <kernel/Number.h>
+diff --git a/kernel/PowerSeries.h b/kernel/PowerSeries.h
+index 809d0b5..7c3f764 100644
+--- a/kernel/PowerSeries.h
++++ b/kernel/PowerSeries.h
+@@ -1,6 +1,6 @@
+ #ifndef POWER_SERIES_HEADER
+ #define POWER_SERIES_HEADER
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/Poly.h>
+ template <class traits> class PowerSeriesInputIterator:
+ public std::
+diff --git a/kernel/clapconv.cc b/kernel/clapconv.cc
+index 6be51df..f0c1b7c 100644
+--- a/kernel/clapconv.cc
++++ b/kernel/clapconv.cc
+@@ -7,7 +7,7 @@
+ */
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #ifdef HAVE_FACTORY
+ #include <omalloc/omalloc.h>
+ #include <kernel/structs.h>
+diff --git a/kernel/clapsing.cc b/kernel/clapsing.cc
+index a3f37a4..a3f23e1 100644
+--- a/kernel/clapsing.cc
++++ b/kernel/clapsing.cc
+@@ -7,7 +7,7 @@
+ */
+
+ //#define FACTORIZE2_DEBUG
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+ #ifdef HAVE_FACTORY
+ #define SI_DONT_HAVE_GLOBAL_VARS
+diff --git a/kernel/dError.c b/kernel/dError.c
+index 5ea1d19..6c229cb 100644
+--- a/kernel/dError.c
++++ b/kernel/dError.c
+@@ -11,7 +11,7 @@
+ #define DERROR_C
+ #include <stdarg.h>
+ #include <stdio.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/distrib.h>
+ #ifdef HAVE_CONFIG_H
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/digitech.cc b/kernel/digitech.cc
+index 25df89f..6039e43 100644
+--- a/kernel/digitech.cc
++++ b/kernel/digitech.cc
+@@ -1,7 +1,7 @@
+ /****************************************
+ * Computer Algebra System SINGULAR *
+ ****************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/ring.h>
+
+ #include <kernel/digitech.h>
+diff --git a/kernel/digitech.h b/kernel/digitech.h
+index b8d0fd3..a1ceb37 100644
+--- a/kernel/digitech.h
++++ b/kernel/digitech.h
+@@ -1,6 +1,6 @@
+ #ifndef DIGITECH_HEADER
+ #define DIGITECH_HEADER
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/polys.h>
+ void bit_reduce(poly & f,ring r);
+ poly uni_subst_bits(poly outer_uni, poly inner_multi, ring r);
+diff --git a/kernel/eigenval.cc b/kernel/eigenval.cc
+index a0934a3..d2ce108 100644
+--- a/kernel/eigenval.cc
++++ b/kernel/eigenval.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT: eigenvalues of constant square matrices
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_EIGENVAL
+
+diff --git a/kernel/f5c.cc b/kernel/f5c.cc
+index c1e3b33..caebac9 100644
+--- a/kernel/f5c.cc
++++ b/kernel/f5c.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #ifdef HAVE_F5C
+ #include <unistd.h>
+ #include <kernel/structs.h>
+diff --git a/kernel/f5data.cc b/kernel/f5data.cc
+index d872f61..d606a4e 100644
+--- a/kernel/f5data.cc
++++ b/kernel/f5data.cc
+@@ -5,7 +5,7 @@
+ /*
+ * ABSTRACT: lpolynomial definition
+ */
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_F5
+ #include <kernel/kutil.h>
+diff --git a/kernel/f5gb.cc b/kernel/f5gb.cc
+index d308517..72b20d0 100644
+--- a/kernel/f5gb.cc
++++ b/kernel/f5gb.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT: f5gb interface
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #ifdef HAVE_F5
+ #include <unistd.h>
+ #include <omp.h>
+diff --git a/kernel/f5lists.cc b/kernel/f5lists.cc
+index ae0bcab..4546a17 100644
+--- a/kernel/f5lists.cc
++++ b/kernel/f5lists.cc
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_F5
+ #include <kernel/kutil.h>
+diff --git a/kernel/fast_maps.cc b/kernel/fast_maps.cc
+index 619c4fd..c38fd20 100644
+--- a/kernel/fast_maps.cc
++++ b/kernel/fast_maps.cc
+@@ -7,7 +7,7 @@
+ * Author: obachman (Olaf Bachmann)
+ * Created: 02/01
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/options.h>
+ #include <kernel/p_polys.h>
+diff --git a/kernel/fast_mult.cc b/kernel/fast_mult.cc
+index 120a29a..ae42b3b 100644
+--- a/kernel/fast_mult.cc
++++ b/kernel/fast_mult.cc
+@@ -1,7 +1,7 @@
+ /****************************************
+ * Computer Algebra System SINGULAR *
+ ****************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/ring.h>
+ #include <kernel/fast_mult.h>
+ #include <kernel/kbuckets.h>
+diff --git a/kernel/fast_mult.h b/kernel/fast_mult.h
+index 43a4344..41e97e4 100644
+--- a/kernel/fast_mult.h
++++ b/kernel/fast_mult.h
+@@ -1,6 +1,6 @@
+ #ifndef fast_mult_header
+ #define fast_mult_header
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/polys.h>
+ poly unifastmult(poly f,poly g, ring r);
+ poly multifastmult(poly f, poly g, ring r);
+diff --git a/kernel/feResource.cc b/kernel/feResource.cc
+index 30ace22..01bb816 100644
+--- a/kernel/feResource.cc
++++ b/kernel/feResource.cc
+@@ -9,7 +9,7 @@
+ #include <unistd.h>
+ #include <string.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #ifdef AIX_4
+ #define HAVE_PUTENV 1
+ #endif
+diff --git a/kernel/febase.cc b/kernel/febase.cc
+index 865c9d7..725eca2 100644
+--- a/kernel/febase.cc
++++ b/kernel/febase.cc
+@@ -7,7 +7,7 @@
+
+ /* I need myfread in standalone_parser */
+ #ifndef STANDALONE_PARSER
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #include <stdlib.h>
+ #include <stdio.h>
+diff --git a/kernel/fegetopt.c b/kernel/fegetopt.c
+index 47fd931..3cf3db8 100644
+--- a/kernel/fegetopt.c
++++ b/kernel/fegetopt.c
+@@ -31,7 +31,7 @@
+ */
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifndef __STDC__
+ # ifndef const
+diff --git a/kernel/feread.cc b/kernel/feread.cc
+index d861fc6..8f67c5e 100644
+--- a/kernel/feread.cc
++++ b/kernel/feread.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT: input from ttys, simulating fgets
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ // ----------------------------------------
+ // system settings:
+diff --git a/kernel/fereadl.c b/kernel/fereadl.c
+index d2f6c1c..1c495be 100644
+--- a/kernel/fereadl.c
++++ b/kernel/fereadl.c
+@@ -6,7 +6,7 @@
+ */
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/febase.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/structs.h>
+diff --git a/kernel/ffields.cc b/kernel/ffields.cc
+index be5aeb7..255e590 100644
+--- a/kernel/ffields.cc
++++ b/kernel/ffields.cc
+@@ -6,7 +6,7 @@
+ */
+
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <kernel/febase.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/fglmcomb.cc b/kernel/fglmcomb.cc
+index d8b42a2..4c11eab 100644
+--- a/kernel/fglmcomb.cc
++++ b/kernel/fglmcomb.cc
+@@ -7,7 +7,7 @@
+ * ABSTRACT -
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_FACTORY
+ #include <kernel/options.h>
+diff --git a/kernel/fglmgauss.cc b/kernel/fglmgauss.cc
+index 933e26c..b64613a 100644
+--- a/kernel/fglmgauss.cc
++++ b/kernel/fglmgauss.cc
+@@ -8,7 +8,7 @@
+ * to find linear dependecies of fglmVectors.
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_FACTORY
+ #include <kernel/structs.h>
+diff --git a/kernel/fglmhom.cc b/kernel/fglmhom.cc
+index 16ead96..4636bea 100644
+--- a/kernel/fglmhom.cc
++++ b/kernel/fglmhom.cc
+@@ -9,7 +9,7 @@
+ */
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #if 0
+ #include <factoryconf.h>
+ #ifndef NOSTREAMIO
+diff --git a/kernel/fglmvec.cc b/kernel/fglmvec.cc
+index a0a4300..75abda1 100644
+--- a/kernel/fglmvec.cc
++++ b/kernel/fglmvec.cc
+@@ -11,7 +11,7 @@
+ * specialized for this purpose.
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_FACTORY
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/fglmzero.cc b/kernel/fglmzero.cc
+index 2db865f..0a02105 100644
+--- a/kernel/fglmzero.cc
++++ b/kernel/fglmzero.cc
+@@ -17,7 +17,7 @@
+ * o FindUnivariatePolys added
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_FACTORY
+ #include <kernel/options.h>
- diff --git a/kernel/gfan.cc b/kernel/gfan.cc
- index ca08a3c..55c9431 100644
- --- a/kernel/gfan.cc
- +++ b/kernel/gfan.cc
- @@ -6,7 +6,7 @@ $Header: /usr/local/Singular/cvsroot/kernel/gfan.cc,v 1.103 2009/11/03 06:57:32
- $Id: gfan.cc 14493 2012-01-16 11:00:07Z motsak $
- */
-
- -#include <kernel/mod2.h>
- +#include <Singular/mod2.h>
-
- #ifdef HAVE_FANS
- #include <kernel/options.h>
+diff --git a/kernel/gnumpc.cc b/kernel/gnumpc.cc
+index 62ea1f0..e3a28a8 100644
+--- a/kernel/gnumpc.cc
++++ b/kernel/gnumpc.cc
+@@ -7,7 +7,7 @@
+ * ngc == number gnu complex
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/gnumpfl.cc b/kernel/gnumpfl.cc
+index 8438dd5..eb7294b 100644
+--- a/kernel/gnumpfl.cc
++++ b/kernel/gnumpfl.cc
+@@ -7,7 +7,7 @@
+ * ngf == number gnu floats
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/gr_kstd2.cc b/kernel/gr_kstd2.cc
+index 27e0152..c311b81 100644
+--- a/kernel/gr_kstd2.cc
++++ b/kernel/gr_kstd2.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT - Kernel: noncomm. alg. of Buchberger
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_PLURAL
+
+diff --git a/kernel/gring.cc b/kernel/gring.cc
+index bfbde4f..c811cca 100644
+--- a/kernel/gring.cc
++++ b/kernel/gring.cc
+@@ -16,7 +16,7 @@
+ #define OM_TRACK 5
+ #endif
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_PLURAL
+ #define PLURAL_INTERNAL_DECLARATIONS
+diff --git a/kernel/hdegree.cc b/kernel/hdegree.cc
+index 2e3053e..6d4cecd 100644
+--- a/kernel/hdegree.cc
++++ b/kernel/hdegree.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT - dimension, multiplicity, HC, kbase
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+
+ #include <kernel/structs.h>
+diff --git a/kernel/hilb.cc b/kernel/hilb.cc
+index e629397..f687164 100644
+--- a/kernel/hilb.cc
++++ b/kernel/hilb.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT - Hilbert series
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/hutil.cc b/kernel/hutil.cc
+index 493e69f..44fa8b3 100644
+--- a/kernel/hutil.cc
++++ b/kernel/hutil.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT: Utilities for staircase operations
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/ideals.cc b/kernel/ideals.cc
+index 224c48e..92db602 100644
+--- a/kernel/ideals.cc
++++ b/kernel/ideals.cc
+@@ -6,7 +6,7 @@
+ */
+
+ /* includes */
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifndef NDEBUG
+ # define MYTEST 0
+diff --git a/kernel/int64vec.cc b/kernel/int64vec.cc
+index ef39725..31a6323 100644
+--- a/kernel/int64vec.cc
++++ b/kernel/int64vec.cc
+@@ -4,7 +4,7 @@
+ /*
+ * ABSTRACT: class int64vec: lists/vectors of int64
+ */
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+ #include <kernel/int64vec.h>
+diff --git a/kernel/intvec.cc b/kernel/intvec.cc
+index 075d1ea..7688255 100644
+--- a/kernel/intvec.cc
++++ b/kernel/intvec.cc
+@@ -6,7 +6,7 @@
+ */
+ #ifndef INTVEC_CC
+ #define INTVEC_CC
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/febase.h>
+ #include <kernel/options.h>
+ #include <kernel/intvec.h>
+diff --git a/kernel/kbuckets.cc b/kernel/kbuckets.cc
+index 7a6833d..650bff3 100644
+--- a/kernel/kbuckets.cc
++++ b/kernel/kbuckets.cc
+@@ -2,7 +2,7 @@
+ * Computer Algebra System SINGULAR *
+ ****************************************/
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/p_polys.h>
+diff --git a/kernel/khstd.cc b/kernel/khstd.cc
+index 51039c4..23c863d 100644
+--- a/kernel/khstd.cc
++++ b/kernel/khstd.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT:utils for hilbert driven kStd
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/febase.h>
+ #include <kernel/options.h>
+ #include <kernel/polys.h>
+diff --git a/kernel/kspoly.cc b/kernel/kspoly.cc
+index 372aa41..0bb1c9e 100644
+--- a/kernel/kspoly.cc
++++ b/kernel/kspoly.cc
+@@ -6,7 +6,7 @@
+ */
+
+ // #define PDEBUG 2
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <kernel/kutil.h>
+ #include <kernel/numbers.h>
+diff --git a/kernel/kstd1.cc b/kernel/kstd1.cc
+index dd98db2..a055f4d 100644
+--- a/kernel/kstd1.cc
++++ b/kernel/kstd1.cc
+@@ -13,7 +13,7 @@
+ // define if buckets should be used
+ #define MORA_USE_BUCKETS
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+
+ #ifndef NDEBUG
+diff --git a/kernel/kstd2.cc b/kernel/kstd2.cc
+index 719097e..0e921cf 100644
+--- a/kernel/kstd2.cc
++++ b/kernel/kstd2.cc
+@@ -12,7 +12,7 @@
+ // define to enable tailRings
+ #define HAVE_TAIL_RING
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifndef NDEBUG
+ # define MYTEST 0
+diff --git a/kernel/kstdfac.cc b/kernel/kstdfac.cc
+index 437a9d5..3c6b003 100644
+--- a/kernel/kstdfac.cc
++++ b/kernel/kstdfac.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT - Kernel: factorizing alg. of Buchberger
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/options.h>
+ #include <kernel/polys.h>
+diff --git a/kernel/kutil.cc b/kernel/kutil.cc
+index 1e3341c..86d1e6b 100644
+--- a/kernel/kutil.cc
++++ b/kernel/kutil.cc
+@@ -10,7 +10,7 @@
+ #define KUTIL_CC
+ #include <stdlib.h>
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifndef NDEBUG
+ # define MYTEST 0
+diff --git a/kernel/linearAlgebra.cc b/kernel/linearAlgebra.cc
+index 74842dc..015cac2 100644
+--- a/kernel/linearAlgebra.cc
++++ b/kernel/linearAlgebra.cc
+@@ -14,7 +14,7 @@
+ /*****************************************************************************/
+
+ // include header files
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/polys.h>
+ #include <kernel/ideals.h>
+diff --git a/kernel/longalg.cc b/kernel/longalg.cc
+index 5b26264..b86431f 100644
+--- a/kernel/longalg.cc
++++ b/kernel/longalg.cc
+@@ -7,7 +7,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/febase.h>
+diff --git a/kernel/longrat.cc b/kernel/longrat.cc
+index 396c48f..844010f 100644
+--- a/kernel/longrat.cc
++++ b/kernel/longrat.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT: computation with long rational numbers (Hubert Grassmann)
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/longrat.h>
+
+diff --git a/kernel/longrat0.cc b/kernel/longrat0.cc
+index f4d1e32..7ecaabe 100644
+--- a/kernel/longrat0.cc
++++ b/kernel/longrat0.cc
+@@ -8,7 +8,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/febase.h>
+diff --git a/kernel/longtrans.cc b/kernel/longtrans.cc
+index cf2ebef..88d48ab 100644
+--- a/kernel/longtrans.cc
++++ b/kernel/longtrans.cc
+@@ -9,7 +9,7 @@
+ #if 0
+ #include <stdio.h>
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/febase.h>
+diff --git a/kernel/lplist.cc b/kernel/lplist.cc
+index 0f5fdc3..35bacb9 100644
+--- a/kernel/lplist.cc
++++ b/kernel/lplist.cc
+@@ -4,7 +4,7 @@
+ /*
+ * ABSTRACT: list interface
+ */
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_F5
+
+diff --git a/kernel/maps.cc b/kernel/maps.cc
+index d323ca8..951c2c9 100644
+--- a/kernel/maps.cc
++++ b/kernel/maps.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT - the mapping of polynomials to other rings
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <kernel/febase.h>
+ #include <kernel/polys.h>
+diff --git a/kernel/matpol.cc b/kernel/matpol.cc
+index 304c249..16b0ea7 100644
+--- a/kernel/matpol.cc
++++ b/kernel/matpol.cc
+@@ -9,7 +9,7 @@
+ #include <stdio.h>
+ #include <math.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <kernel/structs.h>
+ #include <kernel/kstd1.h>
+diff --git a/kernel/misc.cc b/kernel/misc.cc
+index 4ba410c..21ecce5 100644
+--- a/kernel/misc.cc
++++ b/kernel/misc.cc
+@@ -12,7 +12,7 @@
+ #include <stdlib.h>
+ #include <time.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/structs.h>
+diff --git a/kernel/mmalloc.cc b/kernel/mmalloc.cc
+index 2050e59..0a3b6d4 100644
+--- a/kernel/mmalloc.cc
++++ b/kernel/mmalloc.cc
+@@ -6,7 +6,7 @@
+ */
+ #include <stdlib.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #include <omalloc/omalloc.h>
+ #include <new>
+diff --git a/kernel/mmstd.c b/kernel/mmstd.c
+index 6ccb824..f2fd277 100644
+--- a/kernel/mmstd.c
++++ b/kernel/mmstd.c
+@@ -6,7 +6,7 @@
+ * i.e. (malloc/realloc/free)
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #include <omalloc/omalloc.h>
+ #include <Singular/static.h>
+diff --git a/kernel/mod_raw.cc b/kernel/mod_raw.cc
+index 14e4667..64519a8 100644
+--- a/kernel/mod_raw.cc
++++ b/kernel/mod_raw.cc
+@@ -16,7 +16,7 @@
+ #include <sys/stat.h>
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <Singular/static.h>
+
+ #include <kernel/mod_raw.h>
+diff --git a/kernel/modulop.cc b/kernel/modulop.cc
+index 8b9089f..126d712 100644
+--- a/kernel/modulop.cc
++++ b/kernel/modulop.cc
+@@ -6,7 +6,7 @@
+ */
+
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+diff --git a/kernel/mpr_base.cc b/kernel/mpr_base.cc
+index 100b670..19a5695 100644
+--- a/kernel/mpr_base.cc
++++ b/kernel/mpr_base.cc
+@@ -8,7 +8,7 @@
+
+ #include <math.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #include <omalloc/mylimits.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/mpr_complex.cc b/kernel/mpr_complex.cc
+index 9fb1056..255e14f 100644
+--- a/kernel/mpr_complex.cc
++++ b/kernel/mpr_complex.cc
+@@ -10,7 +10,7 @@
+
+ // WARNING! ALWAYS use omAlloc and FreeL when alloc. memory for some char* !!
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ //#ifdef HAVE_MPR
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+diff --git a/kernel/mpr_inout.cc b/kernel/mpr_inout.cc
+index f8c9b7e..3e13e7e 100644
+--- a/kernel/mpr_inout.cc
++++ b/kernel/mpr_inout.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT - multipolynomial resultant
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ //#ifdef HAVE_MPR
+
+ //-> includes
+diff --git a/kernel/mpr_numeric.cc b/kernel/mpr_numeric.cc
+index 79c741b..55bb031 100644
+--- a/kernel/mpr_numeric.cc
++++ b/kernel/mpr_numeric.cc
+@@ -8,7 +8,7 @@
+ * ( root finder, vandermonde system solver, simplex )
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ //#ifdef HAVE_MPR
+
+ //#define mprDEBUG_ALL
+diff --git a/kernel/multicnt.cc b/kernel/multicnt.cc
+index 9f11b1d..de21ed3 100644
+--- a/kernel/multicnt.cc
++++ b/kernel/multicnt.cc
+@@ -7,7 +7,7 @@
+
+ #define MULTICNT_CC
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_SPECTRUM
+
+diff --git a/kernel/ncSACache.cc b/kernel/ncSACache.cc
+index 742ebba..86b86e5 100644
+--- a/kernel/ncSACache.cc
++++ b/kernel/ncSACache.cc
+@@ -17,7 +17,7 @@
+ #endif
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifndef NDEBUG
+ #define OUTPUT 1
+diff --git a/kernel/ncSAFormula.cc b/kernel/ncSAFormula.cc
+index b4fefe0..c985bda 100644
+--- a/kernel/ncSAFormula.cc
++++ b/kernel/ncSAFormula.cc
+@@ -17,7 +17,7 @@
+ #endif
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_PLURAL
+
+diff --git a/kernel/ncSAMult.cc b/kernel/ncSAMult.cc
+index e654af0..7f975f2 100644
+--- a/kernel/ncSAMult.cc
++++ b/kernel/ncSAMult.cc
+@@ -17,7 +17,7 @@
+ #endif
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_PLURAL
+
+diff --git a/kernel/npolygon.cc b/kernel/npolygon.cc
+index afb939b..b54d941 100644
+--- a/kernel/npolygon.cc
++++ b/kernel/npolygon.cc
+@@ -7,7 +7,7 @@
+
+ #define NPOLYGON_CC
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_SPECTRUM
+
+diff --git a/kernel/numbers.cc b/kernel/numbers.cc
+index 61b68a7..35c08b2 100644
+--- a/kernel/numbers.cc
++++ b/kernel/numbers.cc
+@@ -8,7 +8,7 @@
+
+ #include <string.h>
+ #include <stdlib.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+ #include <kernel/kstd1.h>
+diff --git a/kernel/pDebug.cc b/kernel/pDebug.cc
+index 6d31e4b..931983f 100644
+--- a/kernel/pDebug.cc
++++ b/kernel/pDebug.cc
+@@ -14,7 +14,7 @@
+ #include <stdio.h>
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #ifdef PDEBUG
+
+ // do the following to always enforce checking of pSetm
+diff --git a/kernel/pInline0.cc b/kernel/pInline0.cc
+index f851034..7eb90cb 100644
+--- a/kernel/pInline0.cc
++++ b/kernel/pInline0.cc
+@@ -9,7 +9,7 @@
+ *******************************************************************/
+ #ifndef PINLINE0_CC
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #define PINLINE0_CC
+ #undef DO_PINLINE0
+diff --git a/kernel/pInline1.cc b/kernel/pInline1.cc
+index 40563b6..e30321d 100644
+--- a/kernel/pInline1.cc
++++ b/kernel/pInline1.cc
+@@ -10,7 +10,7 @@
+ #ifndef PINLINE1_CC
+ #define PINLINE1_CC
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef PDEBUG
+
+diff --git a/kernel/pInline2.cc b/kernel/pInline2.cc
+index 5b4ede8..b71b8ad 100644
+--- a/kernel/pInline2.cc
++++ b/kernel/pInline2.cc
+@@ -9,7 +9,7 @@
+ *******************************************************************/
+ #ifndef PINLINE2_CC
+ #define PINLINE2_CC
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef PDEBUG
+
+diff --git a/kernel/pShallowCopyDelete.cc b/kernel/pShallowCopyDelete.cc
+index 24cdff5..3c0be0a 100644
+--- a/kernel/pShallowCopyDelete.cc
++++ b/kernel/pShallowCopyDelete.cc
+@@ -7,7 +7,7 @@
+ * Author: obachman (Olaf Bachmann)
+ * Created: 8/00
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/p_polys.h>
+ #include <kernel/ring.h>
+ #include <kernel/pShallowCopyDelete.h>
+diff --git a/kernel/p_Mult_q.cc b/kernel/p_Mult_q.cc
+index bbb07ef..cbec90e 100644
+--- a/kernel/p_Mult_q.cc
++++ b/kernel/p_Mult_q.cc
+@@ -7,7 +7,7 @@
+ * Author: obachman (Olaf Bachmann)
+ * Created: 8/00
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ /***************************************************************
+ *
+diff --git a/kernel/p_Mult_q.h b/kernel/p_Mult_q.h
+index 4da031f..8ec326f 100644
+--- a/kernel/p_Mult_q.h
++++ b/kernel/p_Mult_q.h
+@@ -8,7 +8,7 @@
+ * Author: obachman (Olaf Bachmann)
+ * Created: 8/00
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+
+ // Use buckets if min(pLength(p), pLength(q)) >= MIN_LENGTH_BUCKET
+diff --git a/kernel/p_Procs_Dynamic.cc b/kernel/p_Procs_Dynamic.cc
+index 8f30e78..58f1249 100644
+--- a/kernel/p_Procs_Dynamic.cc
++++ b/kernel/p_Procs_Dynamic.cc
+@@ -7,7 +7,7 @@
+ * Author: obachman (Olaf Bachmann)
+ * Created: 12/00
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/p_polys.h>
+ #include <kernel/ring.h>
+diff --git a/kernel/p_Procs_Generate.cc b/kernel/p_Procs_Generate.cc
+index af1003d..5ed8398 100644
+--- a/kernel/p_Procs_Generate.cc
++++ b/kernel/p_Procs_Generate.cc
+@@ -14,7 +14,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/dError.c>
+
+ #ifdef p_Procs_Static
+diff --git a/kernel/p_Procs_Lib.cc b/kernel/p_Procs_Lib.cc
+index 5ff7c37..4014665 100644
+--- a/kernel/p_Procs_Lib.cc
++++ b/kernel/p_Procs_Lib.cc
+@@ -7,7 +7,7 @@
+ * Author: obachman (Olaf Bachmann)
+ * Created: 12/00
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/p_polys.h>
+ #include <kernel/ring.h>
+diff --git a/kernel/p_Procs_Static.cc b/kernel/p_Procs_Static.cc
+index a3aa326..a93f493 100644
+--- a/kernel/p_Procs_Static.cc
++++ b/kernel/p_Procs_Static.cc
+@@ -7,7 +7,7 @@
+ * Author: obachman (Olaf Bachmann)
+ * Created: 12/00
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/p_polys.h>
+ #include <kernel/ring.h>
+diff --git a/kernel/p_polys.cc b/kernel/p_polys.cc
+index 01c15c6..4e90501 100644
+--- a/kernel/p_polys.cc
++++ b/kernel/p_polys.cc
+@@ -9,7 +9,7 @@
+ *******************************************************************/
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #include <kernel/structs.h>
+ #include <kernel/p_polys.h>
+diff --git a/kernel/page.c b/kernel/page.c
+index 19681d5..4011a14 100644
+--- a/kernel/page.c
++++ b/kernel/page.c
+@@ -1,4 +1,4 @@
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #ifdef PAGE_TEST
+ #include <stdlib.h>
+ #include <unistd.h>
+diff --git a/kernel/polys-impl.cc b/kernel/polys-impl.cc
+index d247b65..a1b751d 100644
+--- a/kernel/polys-impl.cc
++++ b/kernel/polys-impl.cc
+@@ -17,7 +17,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #include <omalloc/omalloc.h>
+ #ifdef PDEBUG
+diff --git a/kernel/polys.cc b/kernel/polys.cc
+index 0bb2b1d..08638b7 100644
+--- a/kernel/polys.cc
++++ b/kernel/polys.cc
+@@ -10,7 +10,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/febase.h>
+diff --git a/kernel/polys0.cc b/kernel/polys0.cc
+index 87aea68..d5ec8fd 100644
+--- a/kernel/polys0.cc
++++ b/kernel/polys0.cc
+@@ -7,7 +7,7 @@
+ */
+
+ /* includes */
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/numbers.h>
+ #include <kernel/ring.h>
+diff --git a/kernel/polys1.cc b/kernel/polys1.cc
+index fa743fd..a3e0e39 100644
+--- a/kernel/polys1.cc
++++ b/kernel/polys1.cc
+@@ -8,7 +8,7 @@
+
+ /* includes */
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <kernel/numbers.h>
+ #include <kernel/ffields.h>
+diff --git a/kernel/prCopy.cc b/kernel/prCopy.cc
+index d335eda..7273cff 100644
+--- a/kernel/prCopy.cc
++++ b/kernel/prCopy.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT - implementation of functions for Copy/Move/Delete for Polys
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/p_polys.h>
+ #include <kernel/numbers.h>
+diff --git a/kernel/ratgring.cc b/kernel/ratgring.cc
+index 48d7a6f..6dc7a5c 100644
+--- a/kernel/ratgring.cc
++++ b/kernel/ratgring.cc
+@@ -7,7 +7,7 @@
+ * Author: levandov (Viktor Levandovsky)
+ * Created: 8/00 - 11/00
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/ratgring.h>
+ #ifdef HAVE_RATGRING
+ #include <kernel/gring.h>
+diff --git a/kernel/ring.cc b/kernel/ring.cc
+index d4a0bd2..6b30f7f 100644
+--- a/kernel/ring.cc
++++ b/kernel/ring.cc
+@@ -7,7 +7,7 @@
+
+ /* includes */
+ #include <math.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/ringgb.cc b/kernel/ringgb.cc
+index c1d510f..60e33c9 100644
+--- a/kernel/ringgb.cc
++++ b/kernel/ringgb.cc
+@@ -7,7 +7,7 @@
+ //#define HAVE_TAIL_RING
+ #define NO_BUCKETS
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/kutil.h>
+ #include <kernel/structs.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/ringgb.h b/kernel/ringgb.h
+index dd05f96..10f15c8 100644
+--- a/kernel/ringgb.h
++++ b/kernel/ringgb.h
+@@ -6,7 +6,7 @@
+ */
+ #ifndef RINGGB_HEADER
+ #define RINGGB_HEADER
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_RINGS
+ #include <kernel/polys.h>
+diff --git a/kernel/rintegers.cc b/kernel/rintegers.cc
+index 199315a..5b3af34 100644
+--- a/kernel/rintegers.cc
++++ b/kernel/rintegers.cc
+@@ -6,7 +6,7 @@
+ */
+
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+diff --git a/kernel/rmodulo2m.cc b/kernel/rmodulo2m.cc
+index 23e8635..13efb52 100644
+--- a/kernel/rmodulo2m.cc
++++ b/kernel/rmodulo2m.cc
+@@ -6,7 +6,7 @@
+ */
+
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_RINGS
+ #include <omalloc/mylimits.h>
+diff --git a/kernel/rmodulon.cc b/kernel/rmodulon.cc
+index e90aab7..17b2720 100644
+--- a/kernel/rmodulon.cc
++++ b/kernel/rmodulon.cc
+@@ -6,7 +6,7 @@
+ */
+
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+diff --git a/kernel/sbuckets.cc b/kernel/sbuckets.cc
+index a99f0c5..2293b27 100644
+--- a/kernel/sbuckets.cc
++++ b/kernel/sbuckets.cc
+@@ -8,7 +8,7 @@
+ * Author: obachman (Olaf Bachmann)
+ * Created: 9/00
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #include <kernel/sbuckets.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/sca.cc b/kernel/sca.cc
+index e28496f..f0b9d4b 100644
+--- a/kernel/sca.cc
++++ b/kernel/sca.cc
+@@ -18,7 +18,7 @@
+ #endif
+
+ // #define PDEBUG 2
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_PLURAL
+ // for
+diff --git a/kernel/semic.cc b/kernel/semic.cc
+index fed3484..dced520 100644
+--- a/kernel/semic.cc
++++ b/kernel/semic.cc
+@@ -7,7 +7,7 @@
+
+ #define SEMIC_CC
+
+-#include"mod2.h"
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_SPECTRUM
+
+diff --git a/kernel/shiftgb.cc b/kernel/shiftgb.cc
+index 04a73f6..fc09395 100644
+--- a/kernel/shiftgb.cc
++++ b/kernel/shiftgb.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT: kernel: utils for shift GB and free GB
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_SHIFTBBA
+ #include <kernel/febase.h>
+diff --git a/kernel/shortfl.cc b/kernel/shortfl.cc
+index fa1646a..31c3f66 100644
+--- a/kernel/shortfl.cc
++++ b/kernel/shortfl.cc
+@@ -7,7 +7,7 @@
+ */
+
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+diff --git a/kernel/sparsmat.cc b/kernel/sparsmat.cc
+index d3d1bed..ad245a6 100644
+--- a/kernel/sparsmat.cc
++++ b/kernel/sparsmat.cc
+@@ -6,7 +6,7 @@
+ * ABSTRACT: operations with sparse matrices (bareiss, ...)
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <kernel/febase.h>
+ #include <kernel/intvec.h>
+diff --git a/kernel/spectrum.cc b/kernel/spectrum.cc
+index 1671a6e..98a8f4f 100644
+--- a/kernel/spectrum.cc
++++ b/kernel/spectrum.cc
+@@ -7,7 +7,7 @@
+
+ #define SPECTRUM_CC
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_SPECTRUM
+
+diff --git a/kernel/splist.cc b/kernel/splist.cc
+index c1db0ae..7a4b65a 100644
+--- a/kernel/splist.cc
++++ b/kernel/splist.cc
+@@ -7,7 +7,7 @@
+
+ #define SPLIST_CC
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ #ifdef HAVE_SPECTRUM
+
+diff --git a/kernel/summator.cc b/kernel/summator.cc
+index 5351586..ce70f0b 100644
+--- a/kernel/summator.cc
++++ b/kernel/summator.cc
+@@ -17,7 +17,7 @@
+ #define OM_TRACK 5
+ #endif
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #ifdef HAVE_PLURAL
+ #include <kernel/summator.h>
+ #include <kernel/options.h>
+diff --git a/kernel/syz.cc b/kernel/syz.cc
+index 2283bf0..bcca57f 100644
+--- a/kernel/syz.cc
++++ b/kernel/syz.cc
+@@ -7,7 +7,7 @@
+ */
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/polys.h>
+diff --git a/kernel/syz0.cc b/kernel/syz0.cc
+index e5e4d2b..2d92449 100644
+--- a/kernel/syz0.cc
++++ b/kernel/syz0.cc
+@@ -6,7 +6,7 @@
+ */
+
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/polys.h>
+diff --git a/kernel/syz1.cc b/kernel/syz1.cc
+index c8537c4..f815067 100644
+--- a/kernel/syz1.cc
++++ b/kernel/syz1.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT: resolutions
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/syz2.cc b/kernel/syz2.cc
+index 83acf72..5014240 100644
+--- a/kernel/syz2.cc
++++ b/kernel/syz2.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT: resolutions
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/syz3.cc b/kernel/syz3.cc
+index b4edc9b..175258f 100644
+--- a/kernel/syz3.cc
++++ b/kernel/syz3.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT: resolutions
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/mylimits.h>
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/tgb.cc b/kernel/tgb.cc
+index 335f221..895c227 100644
+--- a/kernel/tgb.cc
++++ b/kernel/tgb.cc
+@@ -13,7 +13,7 @@
+ ///@TODO: delay nur auf Sugarvergr?erung
+ ///@TODO: grade aus ecartS, setze dazu strat->honey; und nutze p.ecart
+ ///@TODO: no tail reductions in syz comp
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <kernel/tgb.h>
+ #include <kernel/tgb_internal.h>
+diff --git a/kernel/tgbgauss.cc b/kernel/tgbgauss.cc
+index 05ff12d..67c2a15 100644
+--- a/kernel/tgbgauss.cc
++++ b/kernel/tgbgauss.cc
+@@ -4,7 +4,7 @@
+ /*
+ * ABSTRACT: gauss implementation for F4
+ */
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <kernel/tgbgauss.h>
+ #include <omalloc/omalloc.h>
+diff --git a/kernel/tgbgauss.h b/kernel/tgbgauss.h
+index 994a208..8ab56fc 100644
+--- a/kernel/tgbgauss.h
++++ b/kernel/tgbgauss.h
+@@ -6,7 +6,7 @@
+ /*
+ * ABSTRACT: gauss implementation for F4 header
+ */
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/numbers.h>
+ //#include "tgb_internal.h"
+
+diff --git a/kernel/timer.cc b/kernel/timer.cc
+index 4a382bf..7623fa8 100644
+--- a/kernel/timer.cc
++++ b/kernel/timer.cc
+@@ -8,7 +8,7 @@
+ #include <sys/resource.h>
+ #include <unistd.h>
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+
+ int timerv = 0;
+ static double timer_resolution = TIMER_RESOLUTION;
+diff --git a/kernel/tmult.cc b/kernel/tmult.cc
+index c26c61e..647e6e3 100644
+--- a/kernel/tmult.cc
++++ b/kernel/tmult.cc
+@@ -4,7 +4,7 @@
+ * tmult.cc: p_Mult_nn with pthreads - experimental
+ *
+ *******************************************************************/
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/numbers.h>
+ #include <kernel/polys.h>
+diff --git a/kernel/units.cc b/kernel/units.cc
+index 37f7416..3c40728 100644
+--- a/kernel/units.cc
++++ b/kernel/units.cc
+@@ -5,7 +5,7 @@
+ * ABSTRACT: procedures to compute with units
+ */
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/febase.h>
+ #include <kernel/numbers.h>
+diff --git a/kernel/walkMain.cc b/kernel/walkMain.cc
+index c0ac32a..1f5b530 100644
+--- a/kernel/walkMain.cc
++++ b/kernel/walkMain.cc
+@@ -6,7 +6,7 @@
+ *
+ */
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <kernel/intvec.h>
+ #include <kernel/int64vec.h>
+diff --git a/kernel/walkProc.cc b/kernel/walkProc.cc
+index 18945b7..8e39c5a 100644
+--- a/kernel/walkProc.cc
++++ b/kernel/walkProc.cc
+@@ -2,7 +2,7 @@
+ * Computer Algebra System SINGULAR *
+ ****************************************/
+
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/structs.h>
+ #include <kernel/structs.h>
+ #include <kernel/polys.h>
+diff --git a/kernel/walkSupport.cc b/kernel/walkSupport.cc
+index ea9c1fa..ada42f7 100644
+--- a/kernel/walkSupport.cc
++++ b/kernel/walkSupport.cc
+@@ -1,5 +1,5 @@
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/intvec.h>
+ #include <kernel/int64vec.h>
+ #include <kernel/polys.h>
+diff --git a/kernel/weight.cc b/kernel/weight.cc
+index 23a8779..936187b 100644
+--- a/kernel/weight.cc
++++ b/kernel/weight.cc
+@@ -7,7 +7,7 @@
+ */
+
+ #include <math.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <kernel/options.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/polys.h>
+diff --git a/kernel/weight0.c b/kernel/weight0.c
+index 80454d9..04746d5 100644
+--- a/kernel/weight0.c
++++ b/kernel/weight0.c
+@@ -8,7 +8,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <kernel/mod2.h>
++#include <Singular/mod2.h>
+ #include <omalloc/omalloc.h>
+ #include <kernel/structs.h>
+
diff --cc debian/patches/0007-move-libreadline-to-main-binary.patch
index 1f5e471,0000000..c513fb8
mode 100644,000000..100644
--- a/debian/patches/0007-move-libreadline-to-main-binary.patch
+++ b/debian/patches/0007-move-libreadline-to-main-binary.patch
@@@ -1,217 -1,0 +1,217 @@@
- From aea42a0d0b9fbee7789e41923b5aa8a8cbd802de Mon Sep 17 00:00:00 2001
++From 71ce48751a0bba3f98dd703b14ca387dbba1f262 Mon Sep 17 00:00:00 2001
+From: "Bernhard R. Link" <brlink at debian.org>
+Date: Sun, 26 Feb 2012 13:38:14 +0100
+Subject: move libreadline to main binary
+
+and link Singular binary against libsingular instead of carrying a copy
+of everything.
+---
+ Singular/Makefile.in | 8 +++++---
+ kernel/Makefile.in | 17 +++++++++--------
+ kernel/febase.cc | 41 +++++++++++++++++++++++++++++++++++++++++
+ kernel/feread.cc | 27 +--------------------------
+ 4 files changed, 56 insertions(+), 37 deletions(-)
+
+diff --git a/Singular/Makefile.in b/Singular/Makefile.in
+index f1b93ae..8db7465 100644
+--- a/Singular/Makefile.in
++++ b/Singular/Makefile.in
+@@ -132,7 +132,7 @@ HAVE_MPSR = @HAVE_MPSR@
+ #
+ # Handle libSINGULAR stuff
+ #
+-LIBSINGULAR_LIBS =-lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc
++LIBSINGULAR_LIBS =-lsingfac -lsingcf -lntl -lgmp -lomalloc -ldl
+
+ SO_SUFFIX = so
+
+@@ -375,12 +375,14 @@ Singular-static: version.h
+ ${MAKE} LD_STATIC=1 S_EXT="-static" Singular-static
+ echo "#undef HAVE_STATIC" > static.h
+
++SINGULAR_DYNAMIC = libsingular.$(SO_SUFFIX) ../kernel/feread.o ../kernel/fereadl.o
++
+ Singular${S_EXT}: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
+- iparith.o tesths.cc libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS)
++ iparith.o tesths.cc libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS) $(SINGULAR_DYNAMIC)
+ ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} \
+ -o Singular${S_EXT} \
+ tesths.cc iparith.o mpsr_Tok.o claptmpl.o\
+- ${OBJS} ${LDFLAGS} ${LIBS} ../kernel/mmalloc.o
++ ${OBJS} $(SINGULAR_DYNAMIC) ${LDFLAGS} ${LIBS} ../kernel/mmalloc.o
+
+ libsingular: libsingular.${SO_SUFFIX}
+
+diff --git a/kernel/Makefile.in b/kernel/Makefile.in
+index 78d2b07..727364e 100644
+--- a/kernel/Makefile.in
++++ b/kernel/Makefile.in
+@@ -91,7 +91,7 @@ endif
+ # normal C++ source files
+ CXXSOURCES=bigintmat.cc clapconv.cc \
+ clapsing.cc \
+- febase.cc feread.cc feResource.cc \
++ febase.cc feResource.cc \
+ ffields.cc hdegree.cc hilb.cc hutil.cc \
+ sca.cc gring.cc gr_kstd2.cc summator.cc ncSAMult.cc ncSAFormula.cc \
+ ideals.cc intvec.cc int64vec.cc \
+@@ -119,7 +119,7 @@ CXXSOURCES=bigintmat.cc clapconv.cc \
+ CXXSOURCES2 = SingularBuilder.cpp
+
+ # normal C source files
+-CSOURCES=weight0.c fegetopt.c fereadl.c dError.c mmstd.c
++CSOURCES=weight0.c fegetopt.c dError.c mmstd.c
+
+ # C++ sources which are used if part of the kernel are dynamically linked
+ ifeq ($(DL_KERNEL),1)
+@@ -137,7 +137,8 @@ STATIC_SOURCES=p_Procs_Static.cc
+
+ # special C++ source files (need extra compiling and/or linking), for which
+ # dependencies should be generated
+-ESOURCES=mmalloc.cc $(DL_KERNEL_SOURCES) $(DL_LIB_SOURCES) $(STATIC_SOURCES)
++ESOURCES=mmalloc.cc $(DL_KERNEL_SOURCES) $(DL_LIB_SOURCES) $(STATIC_SOURCES) feread.cc
++ECSOURCES=fereadl.c
+
+ SOURCES=${CSOURCES} ${CXXSOURCES} \
+ prCopyTemplate.cc \
+@@ -177,13 +178,13 @@ HEADERS=bigintmat.h hutil.h idrec.h stairc.h ideals.h \
+ p_Procs_Dynamic.h p_Procs_Impl.h p_Procs_Set.h \
+ p_Procs.h p_Procs_Static.h p_Mult_q.h
+
+-DISTFILES=${SOURCES} ${HEADERS} ${ESOURCES} \
++DISTFILES=${SOURCES} ${HEADERS} ${ESOURCES} ${ECSOURCES} \
+ Makefile.in \
+ mkinstalldirs \
+ prCopy.pl
+
+ OBJS := $(CXXSOURCES:.cc=.o) $(CSOURCES:.c=.o) #$(CXXSOURCES2:.cpp=.o)
+-OBJS2 := $(ESOURCES:.cc=.o)
++OBJS2 := $(ESOURCES:.cc=.o) $(ECSOURCES:.c=.o)
+ OBJSG2 := $(ESOURCES:.cc=.og)
+ OBJSP2 := $(ESOURCES:.cc=.op)
+
+@@ -338,8 +339,8 @@ maintainer-clean: distclean srcclean
+ ## miscellanous targets
+ ##
+
+-TAGS: ${SOURCES} ${ESOURCES} ${HEADERS}
+- etags ${SOURCES} ${ESOURCES} ${HEADERS}
++TAGS: ${SOURCES} ${ESOURCES} ${ECSOURCES} ${HEADERS}
++ etags ${SOURCES} ${ESOURCES} ${ECSOURCES} ${HEADERS}
+
+ tags:
+ ctags *.c *.h *.cc *.inc
+@@ -447,7 +448,7 @@ libkernel_p.a: ${OBJP} ${DL_LIBSP} ${OBJSP2}
+ echo $(@:.d=.og) $(@:.d=.op) " " \\ > $@
+ $(CCM) ${CPPFLAGS} ${DEFSG} $< >> $@
+
+-depend: $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(CSOURCES:.c=.d)
++depend: $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(ECSOURCES:.c=.d) $(CSOURCES:.c=.d)
+ cat *.d *.dd >depend
+
+ ifeq (depend,$(wildcard depend))
+diff --git a/kernel/febase.cc b/kernel/febase.cc
+index 725eca2..971f7fd 100644
+--- a/kernel/febase.cc
++++ b/kernel/febase.cc
+@@ -26,6 +26,47 @@
+ #include <kernel/dError.h>
+ #include <kernel/options.h>
+
++/* some stuff move here from feread.cc: */
++
++/* ===================================================================*/
++/* = batch mode = */
++/* ===================================================================*/
++/* dummy (for batch mode): */
++char * fe_fgets_dummy(const char *pr,char *s, int size)
++{
++ return NULL;
++}
++
++/* ===================================================================*/
++/* = fgets = */
++/* ===================================================================*/
++char * fe_fgets(const char *pr,char *s, int size)
++{
++ if (BVERBOSE(V_PROMPT))
++ {
++ fprintf(stdout,"%s",pr);
++ }
++ mflush();
++ return fgets(s,size,stdin);
++}
++
++char * fe_fgets_stdin_init(const char *pr,char *s, int size) __attribute__((weak));
++char * fe_fgets_stdin_init(const char *pr,char *s, int size) {
++ Werror("No method to read from stdin loaded!\n");
++ return NULL;
++}
++extern "C" {
++void fe_reset_input_mode (void) __attribute__((weak));
++void fe_reset_input_mode (void)
++{
++}
++}
++
++char * (*fe_fgets_stdin)(const char *pr,char *s, int size)
++ = fe_fgets_stdin_init;
++
++/* end of some stuff move here from feread.cc */
++
+ #define fePutChar(c) fputc((unsigned char)(c),stdout)
+ /*0 implementation */
+
+diff --git a/kernel/feread.cc b/kernel/feread.cc
+index 8f67c5e..522ed9c 100644
+--- a/kernel/feread.cc
++++ b/kernel/feread.cc
+@@ -30,10 +30,6 @@
+ #include <unistd.h>
+ #endif
+
+-static char * fe_fgets_stdin_init(const char *pr,char *s, int size);
+-char * (*fe_fgets_stdin)(const char *pr,char *s, int size)
+- = fe_fgets_stdin_init;
+-
+ extern char *iiArithGetCmd(int);
+
+ /* ===================================================================*/
+@@ -289,23 +285,11 @@ char * fe_fgets_stdin_drl(const char *pr,char *s, int size)
+ }
+ #endif
+
+-/* ===================================================================*/
+-/* = fgets = */
+-/* ===================================================================*/
+-char * fe_fgets(const char *pr,char *s, int size)
+-{
+- if (BVERBOSE(V_PROMPT))
+- {
+- fprintf(stdout,"%s",pr);
+- }
+- mflush();
+- return fgets(s,size,stdin);
+-}
+
+ /* ===================================================================*/
+ /* = init for static rl, dyn. rl, emu. rl = */
+ /* ===================================================================*/
+-static char * fe_fgets_stdin_init(const char *pr,char *s, int size)
++char * fe_fgets_stdin_init(const char *pr,char *s, int size)
+ {
+ #if (defined(HAVE_READLINE) || defined(HAVE_LIBREADLINE)) && !defined(HAVE_DYN_RL) && !defined(HAVE_FEREAD)
+ /* Allow conditional parsing of the ~/.inputrc file. */
+@@ -393,12 +377,3 @@ static char * fe_fgets_stdin_init(const char *pr,char *s, int size)
+ #endif
+ }
+
+-/* ===================================================================*/
+-/* = batch mode = */
+-/* ===================================================================*/
+-/* dummy (for batch mode): */
+-char * fe_fgets_dummy(const char *pr,char *s, int size)
+-{
+- return NULL;
+-}
+-
diff --cc debian/patches/0008-default-path-settings.patch
index fdf349e,0000000..adf303a
mode 100644,000000..100644
--- a/debian/patches/0008-default-path-settings.patch
+++ b/debian/patches/0008-default-path-settings.patch
@@@ -1,58 -1,0 +1,58 @@@
- From e8dffdd2d0a41af2676cbbed091c69a3cfa04e9a Mon Sep 17 00:00:00 2001
++From 12a697b6a0a8947b3c3ce4223d6206ec5069c120 Mon Sep 17 00:00:00 2001
+From: "Bernhard R. Link" <brlink at debian.org>
+Date: Sat, 25 Feb 2012 13:47:46 +0100
+Subject: default path settings
+
+- Hardcode "Singular" pathname, so we can install the library to a
+ different location than the binaries.
+- as S_BIN_DIR and S_ROOT_DIR are the same in the Debian package,
+ don't default ROOT_DIR to BIN_DIR/..
+- xterm set as x-terminal-emulator alternative.
+- emacs binary located in /usr/bin
+- remove %b/.. and %r/.. from default search path in order to
+ not look into /usr/lib/LIB for libraries.
+---
+ kernel/feResource.cc | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/kernel/feResource.cc b/kernel/feResource.cc
+index 01bb816..950929a 100644
+--- a/kernel/feResource.cc
++++ b/kernel/feResource.cc
+@@ -75,13 +75,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 *)""},
+@@ -94,8 +92,8 @@ static feResourceConfig_s feResourceConfigs[] =
+ {"Path", 'p', feResPath, NULL, "%b;$PATH", (char *)""},
+
+ #ifdef ESINGULAR
+- {"emacs", 'E', feResBinary,"ESINGULAR_EMACS", "%b/emacs", (char *)""},
+- {"xemacs", 'A', feResBinary,"ESINGULAR_EMACS", "%b/xemacs", (char *)""},
++ {"emacs", 'E', feResBinary,"ESINGULAR_EMACS", "/usr/bin/emacs", (char *)""},
++ {"xemacs", 'A', feResBinary,"ESINGULAR_EMACS", "/usr/bin/xemacs", (char *)""},
+ {"SingularEmacs",'M', feResBinary,"ESINGULAR_SINGULAR", "%b/Singular", (char *)""},
+ {"EmacsLoad", 'l', feResFile, "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular", (char *)""},
+ {"EmacsDir", 'e', feResDir, "ESINGULAR_EMACS_DIR", "%r/emacs", (char *)""},
+@@ -104,7 +102,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 --cc debian/patches/0009-fix-NTL-negate-namespace-issue.patch
index 6389cfe,0000000..e752bf4
mode 100644,000000..100644
--- a/debian/patches/0009-fix-NTL-negate-namespace-issue.patch
+++ b/debian/patches/0009-fix-NTL-negate-namespace-issue.patch
@@@ -1,28 -1,0 +1,28 @@@
- From f904878e4a22df56f70d62070b3478717e644c3c Mon Sep 17 00:00:00 2001
++From a289754094dc34116cb2a65fbe388fee4daed6da Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Sun, 14 Jul 2013 08:55:12 +0200
+Subject: fix NTL::negate namespace issue
+
+---
+ factory/cf_chinese.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/factory/cf_chinese.cc b/factory/cf_chinese.cc
+index 2761c95..6ee8215 100644
+--- a/factory/cf_chinese.cc
++++ b/factory/cf_chinese.cc
+@@ -211,12 +211,12 @@ CanonicalForm Farey ( const CanonicalForm & f, const CanonicalForm & q )
+ ZZ NTLc= convertFacCF2NTLZZ (c);
+ bool lessZero= (sign (NTLc) == -1);
+ if (lessZero)
+- negate (NTLc, NTLc);
++ NTL::negate (NTLc, NTLc);
+ ZZ NTLnum, NTLden;
+ if (ReconstructRational (NTLnum, NTLden, NTLc, NTLq, bound, bound))
+ {
+ if (lessZero)
+- negate (NTLnum, NTLnum);
++ NTL::negate (NTLnum, NTLnum);
+ CanonicalForm num= convertNTLZZX2CF (to_ZZX (NTLnum), Variable (1));
+ CanonicalForm den= convertNTLZZX2CF (to_ZZX (NTLden), Variable (1));
+ On (SW_RATIONAL);
diff --cc debian/patches/0010-install-factory.h-where-libfac-expects-it.patch
index e390b85,0000000..bc45e3e
mode 100644,000000..100644
--- a/debian/patches/0010-install-factory.h-where-libfac-expects-it.patch
+++ b/debian/patches/0010-install-factory.h-where-libfac-expects-it.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 80af528c075a9215ceb425f9221350be1a184fc3 Mon Sep 17 00:00:00 2001
++From 89a59f0679fe904fa320156d4411f18d5e106b08 Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Mon, 15 Jul 2013 20:34:30 +0200
+Subject: install factory.h where libfac expects it.
+
+---
+ factory/GNUmakefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/factory/GNUmakefile.in b/factory/GNUmakefile.in
+index ad740c9..f2b9c96 100644
+--- a/factory/GNUmakefile.in
++++ b/factory/GNUmakefile.in
+@@ -549,7 +549,7 @@ installcf: cf
+ $(INSTALL_DATA) $(libfactory) $(DESTDIR)$(libdir)/$(libfactory)
+ -$(INSTALL_DATA) libsingcf_g.a $(DESTDIR)$(libdir)/libsingcf_g.a
+ -$(INSTALL_DATA) libsingcf_p.a $(DESTDIR)$(libdir)/libsingcf_p.a
+- $(INSTALL_DATA) factory.h $(DESTDIR)$(includedir)/factory.h
++ $(INSTALL_DATA) factory.h $(DESTDIR)$(includedir)/factory/factory.h
+ $(INSTALL_DATA) cf_gmp.h $(DESTDIR)$(includedir)/factory/cf_gmp.h
+ $(INSTALL_DATA) factoryconf.h $(DESTDIR)$(includedir)/factory/factoryconf.h
+ # FIXME: what is templatedir?
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/singular.git
More information about the debian-science-commits
mailing list