1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
|
Description: debianization
Meant to maintain a minimal debian/rules, to fix warnings,
to address Debian specific stuff in general.
Origin: vendor, Debian
Forwarded: not-needed
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2021-11-22
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
SUBDIRS = resources omalloc factory \
libpolys gfanlib IntegerProgramming \
kernel Singular \
-dox emacs redhat desktop
+dox emacs desktop
DIST_SUBDIRS = $(SUBDIRS) doc
if ENABLE_DOC_BUILD
@@ -40,7 +40,7 @@
-(cd $(datadir); rm -rf singular info/singular.info)
-rm -rf $(htmldir)
-configheaderdir = ${includedir}/singular
+configheaderdir = ${includedir}/$(DEB_HOST_MULTIARCH)/singular
nodist_configheader_HEADERS = singularconfig.h
DISTCLEANFILES = $(nodist_configheader_HEADERS)
--- a/libpolys/Makefile.am
+++ b/libpolys/Makefile.am
@@ -15,7 +15,7 @@
SUBDIRS=misc reporter coeffs polys tests
-configheaderdir = ${includedir}/singular
+configheaderdir = ${includedir}/$(DEB_HOST_MULTIARCH)/singular
nodist_configheader_HEADERS = libpolysconfig.h
DISTCLEANFILES = $(nodist_configheader_HEADERS)
--- a/omalloc/Makefile.am
+++ b/omalloc/Makefile.am
@@ -2,6 +2,7 @@
lib_LTLIBRARIES=libomalloc.la
+configheaderdir = ${includedir}/$(DEB_HOST_MULTIARCH)/omalloc
libomalloc_includedir=$(includedir)/omalloc
libomalloc_include_HEADERS = \
@@ -33,7 +34,8 @@
libomalloc_la_LDFLAGS = $(SINGULAR_LDFLAGS) -release ${PACKAGE_VERSION}
nodist_libomalloc_la_SOURCES = omTables.inc omTables.h
-nodist_libomalloc_include_HEADERS = omConfig.h omTables.h
+nodist_configheader_HEADERS = omConfig.h
+nodist_libomalloc_include_HEADERS = omTables.h
libomalloc_la_CPPFLAGS = ${AM_CPPFLAGS} -DOM_ALLOC_INTERNAL
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -13,6 +13,7 @@
libsingular_resources_la_LDFLAGS = $(SINGULAR_LDFLAGS) -release ${PACKAGE_VERSION}
+configheaderdir = $(includedir)/$(DEB_HOST_MULTIARCH)/resources
libsingular_resources_includedir =$(includedir)/resources
libsingular_resources_include_HEADERS = omFindExec.h feResource.h feFopen.h fegetopt.h\
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
dnl https://www.gnu.org/software/automake/manual/html_node/List-of-Automake-options.html
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-ustar]) # -Wno-extra-portability -Werror silent-rules
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
dnl Check if build env is sane
AM_SANITY_CHECK
@@ -116,6 +116,8 @@
SING_WIN_FLAGS
+AC_SUBST(DEB_HOST_MULTIARCH)
+
PKG_REQUIRE="$PKG_REQUIRE"
AC_SUBST(PKG_REQUIRE)
@@ -295,8 +297,6 @@
AC_CONFIG_FILES([emacs/Makefile])
-AC_CONFIG_FILES([redhat/Makefile])
-AC_CONFIG_FILES([redhat/singular.spec])
AC_CONFIG_FILES([desktop/Makefile desktop/Singular.desktop desktop/Singular-manual.desktop])
AC_CHECK_PROGS([MAKEINFO], [makeinfo])
--- a/libpolys/configure.ac
+++ b/libpolys/configure.ac
@@ -8,7 +8,7 @@
AM_MAINTAINER_MODE([enable])
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
dnl Check if build env is sane
@@ -102,6 +102,8 @@
dnl esac
dnl AC_SUBST(INCLUDES)
+AC_SUBST(DEB_HOST_MULTIARCH)
+
SING_CHECK_OMALLOC()
ENABLE_RESOURCES="yes"
--- a/resources/configure.ac
+++ b/resources/configure.ac
@@ -7,7 +7,7 @@
AM_MAINTAINER_MODE([enable])
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
dnl Check if build env is sane
@@ -41,6 +41,8 @@
# ([shared])
# LT_INIT([win32-dll])(dlopen disable-static) # doesn't work on PowerPC!
+AC_SUBST(DEB_HOST_MULTIARCH)
+
# SING_CHECK_PIPE
SING_WIN_FLAGS
--- a/factory/configure.ac
+++ b/factory/configure.ac
@@ -19,7 +19,7 @@
AC_CONFIG_HEADERS([_config.h])
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AM_MAINTAINER_MODE([enable])
@@ -99,6 +99,8 @@
,
[with_Singular=yes])
+AC_SUBST(DEB_HOST_MULTIARCH)
+
PKG_REQUIRE="$PKG_REQUIRE"
AC_SUBST(PKG_REQUIRE)
--- a/omalloc/configure.ac
+++ b/omalloc/configure.ac
@@ -22,10 +22,12 @@
AM_MAINTAINER_MODE([enable])
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
AM_SANITY_CHECK
+AC_SUBST(DEB_HOST_MULTIARCH)
+
AX_PROG_CC_FOR_BUILD
AC_SUBST(BUILD_EXEEXT)
--- a/gfanlib/configure.ac
+++ b/gfanlib/configure.ac
@@ -9,7 +9,7 @@
AC_CONFIG_HEADERS([_config.h])
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
# Add pre'prefixed config
--- a/Singular/Makefile.am
+++ b/Singular/Makefile.am
@@ -6,6 +6,8 @@
all-local: all.lib gftables MOD ${abs_builddir}/LIB Singular$(EXEEXT) ESingular$(EXEEXT) TSingular$(EXEEXT)
+AM_CPPFLAGS += -DDEB_PKG_VERSION=\"$(DEB_PKG_VERSION)\"
+
if SING_WIN
SUBDIRS = ${BUILTIN_MODULES} . dyn_modules
else
--- a/Singular/tesths.cc
+++ b/Singular/tesths.cc
@@ -162,7 +162,7 @@
" A Computer Algebra System for Polynomial Computations / version %s\n"
" 0<\n"
" by: W. Decker, G.-M. Greuel, G. Pfister, H. Schoenemann \\ %s\n"
-"FB Mathematik der Universitaet, D-67653 Kaiserslautern \\\n"
+"FB Mathematik der Universitaet, D-67653 Kaiserslautern \\ Debian " DEB_PKG_VERSION "\n"
, VERSION, VERSION_DATE);
if (feOptValue(FE_OPT_NO_SHELL))
{
--- a/factory/Makefile.am
+++ b/factory/Makefile.am
@@ -191,9 +191,11 @@
noinst_HEADERS = $(factory_headers)
+configheaderdir = ${includedir}/$(DEB_HOST_MULTIARCH)/factory
libfactory_includedir = ${includedir}/factory
-nodist_libfactory_include_HEADERS = factory.h factoryconf.h
+nodist_libfactory_include_HEADERS = factory.h
+nodist_configheader_HEADERS = factoryconf.h
libfactory_include_HEADERS = globaldefs.h si_log2.h
|
