Description: debianization
 Meant to maintain a minimal debian/rules, to fix warnings,
 to address Debian specific stuff in general.
 This is a Debian centric patch.
Origin: debian
Forwarded: not-needed
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2022-12-26

--- a/configure.ac
+++ b/configure.ac
@@ -102,7 +102,7 @@
 # The reasons for the changed default is that the complexities of
 # building shared libraries are avoided, and also that static build
 # can result in faster code on some architectures.
-AC_DISABLE_SHARED
+##AC_DISABLE_SHARED
 # This triggers selection of some optimization flags (-g -O2), 
 # so it should appear _after_ the AX_CXX_MAXOPT, AX_CC_MAXOPT calls.
 LT_INIT
@@ -167,7 +167,7 @@
   CXXFLAGS="${save_CXXFLAGS}"
 fi
 
-GROEBNER_DEFAULT_EXECUTABLE=4ti2int64
+GROEBNER_DEFAULT_EXECUTABLE=4ti2gmp
 dnl elif test -n "${GMP_HAVE_CXX}" ; then
 dnl    GROEBNER_DEFAULT_EXECUTABLE=4ti2gmp
 dnl else
--- a/src/groebner/script.template.in
+++ b/src/groebner/script.template.in
@@ -64,8 +64,4 @@
     exit 1
 fi
 
-# We add the path $DIR to load shared libraries for the libglpk
-# libgmp, and libgmpxx libraries.
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DIR
-
-"$DIR"/$EXECUTABLE $FUNCTION $@
+exec $DIR/$EXECUTABLE $FUNCTION $@
--- a/src/zsolve/graver.template.in
+++ b/src/zsolve/graver.template.in
@@ -21,4 +21,4 @@
     exit 1
 fi
 
-"$DIR"/$EXECUTABLE -G $@
+exec $DIR/$EXECUTABLE -G $@
--- a/src/zsolve/hilbert.template.in
+++ b/src/zsolve/hilbert.template.in
@@ -21,4 +21,4 @@
     exit 1
 fi
 
-"$DIR"/$EXECUTABLE -H $@
+exec $DIR/$EXECUTABLE -H $@
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,6 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src m4 doc test
+SUBDIRS = src m4 test #doc
 
 EXTRA_DIST = autogen.sh TODO NEWS README.md
--- a/src/4ti2/Makefile.am
+++ b/src/4ti2/Makefile.am
@@ -18,12 +18,17 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 
 
+includearchdir = $(includedir)/$(DEB_HOST_MULTIARCH)
+pkgincludearchdir = $(includearchdir)/4ti2
+
 pkglibbindir = $(pkglibexecdir)/bin
 pkgliblibdir = $(libdir)
 
 fortytwoincludedir = $(pkgincludedir)/4ti2
+fortytwoincludearchdir = $(pkgincludearchdir)/4ti2
 
-fortytwoinclude_HEADERS = 4ti2.h 4ti2xx.h 4ti2_config.h
+fortytwoinclude_HEADERS = 4ti2.h 4ti2xx.h
+fortytwoincludearch_HEADERS = 4ti2_config.h
 
 BUILT_SOURCES = 4ti2_config.h