Description: Compiler and linker flags adjustments.
 .
 regina-rexx (3.6-1) unstable; urgency=low
 .
   * Fixed lintian errors.
   * Upgraded to Standards-Version: 3.9.3.
   * Fixed compilation problem on alpha (closes: #661883).
   * New upstream version.
Author: Alen Zekulic <alen@nms.hr>
Forwarded: not-needed
Bug-Debian: http://bugs.debian.org/661883

--- regina-rexx-3.6.orig/Makefile.in
+++ regina-rexx-3.6/Makefile.in
@@ -41,7 +41,7 @@ INSTALL  = $(srcdir)/install-sh
 CC  = @CC@
 RANLIB = @RANLIB@
 LN_S  = @LN_S@
-CFLAGS = @CFLAGS@
+CFLAGS = $(DEB_CFLAGS)
 LDFLAGS = @LDFLAGS@
 
 RANLIB_DYNAMIC = @RANLIB_DYNAMIC@
@@ -285,7 +285,8 @@ ZIP_CFILES = $(ZIP_CSRCFILES) yaccsrc.c
 DEBIANFILES = $(DEBIAN_DIR)/rules $(DEBIAN_DIR)/control $(DEBIAN_DIR)/changelog $(DEBIAN_DIR)/md5_sums \
 	$(DEBIAN_DIR)/postinst $(DEBIAN_DIR)/postrm $(DEBIAN_DIR)/postrm-dev $(DEBIAN_DIR)/copyright
 
-JUNK = *.o *.so.$(OBJ) $(STATICLIB) execiser$(binarybitprefix)$(EXE) threader$(binarybitprefix)$(EXE) rxqueue$(binarybitprefix)$(EXE) rxstack$(binarybitprefix)$(EXE) rexx$(binarybitprefix)$(EXE) msgcmp$(binarybitprefix)$(EXE) $(SHL_TARGETS) $(SHLPRE)$(SHLFILE)$(SHLPST)* config.cache config.log gci_convert.h *.mtb regina-config rxstack.init.d $(LIBPRE)$(SHLFILE)$(LIBPST)
+#JUNK = *.o *.so.$(OBJ) $(STATICLIB) execiser$(binarybitprefix)$(EXE) threader$(binarybitprefix)$(EXE) rxqueue$(binarybitprefix)$(EXE) rxstack$(binarybitprefix)$(EXE) rexx$(binarybitprefix)$(EXE) msgcmp$(binarybitprefix)$(EXE) $(SHL_TARGETS) $(SHLPRE)$(SHLFILE)$(SHLPST)* config.cache config.log gci_convert.h *.mtb regina-config rxstack.init.d $(LIBPRE)$(SHLFILE)$(LIBPST)
+JUNK = *.o *.so.$(OBJ) $(STATICLIB) execiser$(binarybitprefix)$(EXE) threader$(binarybitprefix)$(EXE) rxqueue$(binarybitprefix)$(EXE) rxstack$(binarybitprefix)$(EXE) rexx$(binarybitprefix)$(EXE) msgcmp$(binarybitprefix)$(EXE) $(SHL_TARGETS) $(SHLPRE)$(SHLFILE)$(SHLPST)* config.cache config.log config.guess config.sub gci_convert.h *.mtb regina-config rxstack.init.d $(LIBPRE)$(SHLFILE)$(LIBPST)
 
 #.SUFFIXES: .sho $(SUFFIXES)
 #
@@ -300,34 +301,28 @@ $(srcdir)/rexx.h : $(srcdir)/extern.h $(
 $(srcdir)/mt.h : $(srcdir)/mt_notmt.h $(srcdir)/mt_posix.h
 
 rexx$(binarybitprefix)$(EXE) : $(OFILES) rexx.$(OBJ) nosaa.$(OBJ)
-	$(PURIFY) $(CC) $(LINKOPT) $(LDFLAGS) $(STATIC_LDFLAGS) -o $@ $(OBJECTS) rexx.$(OBJ) nosaa.$(OBJ) $(STATIC_BINARY_LIBS) $(REXX_BINARY_LIBS)
+	$(PURIFY) $(CC) $(LINKOPT) $(LDFLAGS) $(STATIC_LDFLAGS) -o $@ $(OBJECTS) rexx.$(OBJ) nosaa.$(OBJ)
 	$(LDEXTRA)
-#	$(PURIFY) $(CC) $(LINKOPT) $(LDFLAGS) $(STATIC_LDFLAGS) -o $@ $(OBJECTS) rexx.$(OBJ) nosaa.$(OBJ) $(BOTHLIBS)
 
 regina$(binarybitprefix)$(EXE) : $(SHL_BASE) regina.$(OBJ) $(SHOFILES)
-	$(PURIFY) $(CC) $(TSLINKOPT) $(LDFLAGS) $(DYNAMIC_LDFLAGS) -o $@ regina.$(OBJ) $(LINKREG) $(REGINA_BINARY_LIBS)
+	$(PURIFY) $(CC) -o $@ regina.$(OBJ) $(LDFLAGS) -L. -lregina
 	$(LDEXTRA)
-#	$(PURIFY) $(CC) $(TSLINKOPT) $(LDFLAGS) $(DYNAMIC_LDFLAGS) -o $@ regina.$(OBJ) $(LINKREG) $(BOTHLIBS) $(MH_MT_LIBS)
 
 execiser$(binarybitprefix)$(EXE) : execiser.$(OBJ) $(EXECISER_DEP)
 	$(PURIFY) $(CC) $(TSLINKOPT) $(LDFLAGS) -o $@ execiser.$(OBJ) $(LINKSHL) $(EXECISER_BINARY_LIBS)
 	$(LDEXTRA)
-#	$(PURIFY) $(CC) $(TSLINKOPT) $(LDFLAGS) -o $@ execiser.$(OBJ) $(LINKSHL) $(BOTHLIBS) $(MH_MT_LIBS)
 
 threader$(binarybitprefix)$(EXE) : threader.$(OBJ) $(EXECISER_DEP)
-	$(PURIFY) $(CC) $(TSLINKOPT) $(LDFLAGS) -o $@ threader.$(OBJ) $(LINKSHL) $(THREADER_BINARY_LIBS)
+	$(PURIFY) $(CC) -o $@ threader.$(OBJ) $(LDFLAGS) -L. -lregina -lpthread
 	$(LDEXTRA)
-#	$(PURIFY) $(CC) $(TSLINKOPT) $(LDFLAGS) -o $@ threader.$(OBJ) $(LINKSHL) $(BOTHLIBS) $(MH_MT_LIBS)
 
 rxstack$(binarybitprefix)$(EXE) : rxstack.$(OBJ) erexxbif.$(OBJ) eextstack.$(OBJ)
 	$(PURIFY) $(CC) $(LINKOPT) $(LDFLAGS) $(DYNAMIC_LDFLAGS) -o $@ rxstack.$(OBJ) erexxbif.$(OBJ) eextstack.$(OBJ) $(GETOPT) $(STACK_BINARY_LIBS)
 	$(LDEXTRA)
-#	$(PURIFY) $(CC) $(LINKOPT) $(LDFLAGS) $(DYNAMIC_LDFLAGS) -o $@ rxstack.$(OBJ) erexxbif.$(OBJ) eextstack.$(OBJ) $(GETOPT) $(BOTHLIBS)
 
 rxqueue$(binarybitprefix)$(EXE) : rxqueue.$(OBJ) erexxbif.$(OBJ) eextstack.$(OBJ)
 	$(PURIFY) $(CC) $(LINKOPT) $(LDFLAGS) $(DYNAMIC_LDFLAGS) -o $@ rxqueue.$(OBJ) erexxbif.$(OBJ) eextstack.$(OBJ) $(GETOPT) $(STACK_BINARY_LIBS)
 	$(LDEXTRA)
-#	$(PURIFY) $(CC) $(LINKOPT) $(LDFLAGS) $(DYNAMIC_LDFLAGS) -o $@ rxqueue.$(OBJ) erexxbif.$(OBJ) eextstack.$(OBJ) $(GETOPT) $(BOTHLIBS)
 
 $(LIBPRE)$(LIBFILE)$(LIBPST): $(OFILES) client.$(OBJ) drexx.$(OBJ) rexxsaa.$(OBJ)
 	rm -f $(LIBPRE)$(LIBFILE)$(LIBPST)
@@ -926,7 +921,7 @@ rxsupport.$(OBJ): $(regutildir)/rxsuppor
 #	$(CC) -c $(COPT) $(CC2O) $(DYN_COMP) $(regutildir)/regtrig.c
 
 $(SHLPRE)regutil$(MODPST): $(REGUTILOBJ) $(SHLPRE)$(SHLFILE)$(SHLPST) $(REGUTILEXP)
-	$(LD_RXLIB_UTILA) $(REGUTILEXPORTS) $(REGUTILOBJ) $(LD_RXLIB_UTILB) $(BOTHLIBS)
+	$(LD_RXLIB_UTILA) $(REGUTILEXPORTS) $(REGUTILOBJ) -L. -lregina  $(REGUTIL_TERM_LIB)
 	$(RANLIB_DYNAMIC)
 
 
@@ -1209,7 +1204,7 @@ rpmtopdir:
 install-lib: $(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI)
 	$(INSTALL) -m 644 -c $(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI) $(prefix)/lib/$(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI)
 	$(LN_S) -f $(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI) $(prefix)/lib/$(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI_MAJOR)
-	$(INSTALL) -m 644 -c $(SHLPRE)regutil$(MODPST) $(prefix)/lib/regina/$(ABI)/$(SHLPRE)regutil$(MODPST)
+	$(INSTALL) -m 644 -c $(SHLPRE)regutil$(MODPST) $(prefix)/lib/regina-rexx/$(ABI)/$(SHLPRE)regutil$(MODPST)
 
 install-dev: $(LIBPRE)$(LIBFILE)$(LIBPST)
 # header file
@@ -1220,7 +1215,7 @@ install-dev: $(LIBPRE)$(LIBFILE)$(LIBPST
 # libregina.so.x -> libregina.so
 	$(LN_S) -f $(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI) $(prefix)/lib/$(SHLPRE)$(SHLFILE)$(SHLPST)
 # regina-config
-	$(INSTALL) -m 755 -c ./regina-config $(prefix)/bin/regina-config
+	$(INSTALL) -m 755 -c ./debian/regina-config $(prefix)/bin/regina-config
 	$(INSTALL) -c -m 644 $(srcdir)/regina-config.1 $(prefix)/share/man/man1/regina-config.1
 
 install-rexx: rexx$(EXE) regina$(EXE)
--- regina-rexx-3.6.orig/configure
+++ regina-rexx-3.6/configure
@@ -3445,7 +3445,7 @@ case "$target" in
       ;;
    *linux*|*kfreebsd*-gnu*)
       mach="`uname -m`"
-      if test "$mach" = "x86_64" -o "$mach" = "ia86" -o "$mach" = "alpha" -o "$mach" = "ppc64" -o "$mach" = "s390x"; then
+      if test "$mach" = "x86_64" -o "$mach" = "ia86" -o "$mach" = "ppc64" -o "$mach" = "s390x"; then
          bitflag="64"
          osis64bit=yes
       fi
@@ -8455,7 +8455,7 @@ case "$target" in
                 LD_RXLIB_B2="${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI)"
                 LD_RXLIB_UTILB="${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI)"
                 SHLPRE="lib"
-                SHL_LD="${CC} -o ${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI) -shared ${LDFLAGS} ${SHL_SCRIPT} -Wl,-soname=${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI_MAJOR) \$(SHOFILES)"
+                SHL_LD="${CC} -o ${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI) -shared ${LDFLAGS} ${SHL_SCRIPT} -Wl,-z,relro,-soname=${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI_MAJOR) \$(SHOFILES)"
                 SHL_BASE="${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI)"
                 OTHER_INSTALLS="installabilib"
                 USE_ABI="yes"

--- regina-rexx-3.6.orig/regina.1
+++ regina-rexx-3.6/regina.1
@@ -60,13 +60,13 @@ Sets tracing of the program to the optio
 commands in the program will be ignored.
 If you want to run your program with tracing set to "Intermediate",
 you can use the option
-.B -ti.
+.B \-ti.
 If only
-.B -t
+.B \-t
 is specified, "All" is the trace mode set.
 Multiple tracing options can be specified. eg. To specify "intermediate",
 "interactive" tracing, specify
-.B -ti -t?.
+.B \-ti \-t?.
 
 .IP \-i
 Starts Regina in interactive mode. No script will be executed.
@@ -100,8 +100,8 @@ as a tokenised image. All other switches
 The tokenised image is not allowed to be supplied via stdin.
 
 
-.SH Built-ins
-Below is a list of all the standard built-in functions in Rexx. For a
+.SH Built\-ins
+Below is a list of all the standard built\-in functions in Rexx. For a
 more complete description of each function, see the documentation
 accompanying Regina.
 
@@ -130,7 +130,7 @@ or was omitted. The option `N' is the sa
 option.
 
 .IP B2X(binstring)
-Converts the bin-string `binstring' to a hex-string.
+Converts the bin\-string `binstring' to a hex\-string.
 
 .IP BITAND(string1[,[string2][,padchar]])
 Returns a string which is the bitwise AND of its two first parameters.
@@ -147,7 +147,7 @@ Converts the character string `string' t
 specifies the number of characters in `string' to convert.
 
 .IP C2X(string)
-Converts the character string `string' to a hex-string.
+Converts the character string `string' to a hex\-string.
 
 .IP CENTER(string,length[,padchar])
 .IP CENTRE(string,length[,padchar])
@@ -194,11 +194,11 @@ is a variable, and `BAD' otherwise. If `
 be one of these four, and then `0' or `1' is returned, depending on
 whether `string' is of the named type.
 
-.IP DATE([option-out,[date,[option-in]]])
+.IP DATE([option\-out,[date,[option\-in]]])
 Returns the date, in various formats, which can be Base, Century,
 Days, European, Month, Normal, Ordered, Standard, USA, UnixTime, or Weekday.
-Can also be used to convert a date `date' from one format `option-in'
-to another; `option-out'.
+Can also be used to convert a date `date' from one format `option\-in'
+to another; `option\-out'.
 
 .IP DELSTR(string,start[,length])
 Deletes the substring of `string' starting at position `start' and
@@ -216,12 +216,12 @@ Converts the decimal number `integer' to
 `length'.
 
 .IP D2X(integer[,length])
-Converts the decimal number `integer' to a hex-string of length
+Converts the decimal number `integer' to a hex\-string of length
 `length'.
 
 .IP ERRORTEXT(errno)
 Returns the error text associated with error number `errno'.
-`errno' can specify a sub-error number in the format n.n. eg. 40.1
+`errno' can specify a sub\-error number in the format n.n. eg. 40.1
 
 .IP FORM()
 Returns the current setting of NUMERIC FORM.
@@ -292,7 +292,7 @@ Loads an external function called; `inte
 as known to the interpreter.
 
 .IP SIGN(number)
-Returns `-1', `0', or `1', depending on the sign of `number'.
+Returns `\-1', `0', or `1', depending on the sign of `number'.
 
 .IP SOURCELINE([lineno])
 Returns the number of lines in the source for the current script, or
@@ -321,11 +321,11 @@ Returns a subsequence of `length' words
 .IP SYMBOL(name)
 Test whether `name' is a numbol, variable, literal.
 
-.IP TIME([option-out,[time,[option-in]]])
+.IP TIME([option\-out,[time,[option\-in]]])
 Returns the time, options are Civil, Elapsed, Hours, Long, Minutes,
 Normal, Reset, and Seconds.
-Can also be used to convert a time `time' from one format `option-in'
-to another; `option-out'.
+Can also be used to convert a time `time' from one format `option\-in'
+to another; `option\-out'.
 
 .IP TRACE([setting])
 Returns the current trace setting, and optionally sets a new one.
@@ -365,20 +365,20 @@ Returns in alphabetic order all the char
 from the character `start' to the character `end'.
 
 .IP X2B(hexstring)
-Converts the hex-string `hexstring' to a bin-string.
+Converts the hex\-string `hexstring' to a bin\-string.
 
 .IP X2C(hexstring)
-Converts the hex-string `hexstring' to a character string.
+Converts the hex\-string `hexstring' to a character string.
 
 .IP X2D(hexstring[,length])
 Converts the `length' rightmost characters
-of the hex-string `hexstring' to a decimal number.
+of the hex\-string `hexstring' to a decimal number.
 
 
 
 .SH Copyright
 The Regina Rexx interpreter is distributed under the GNU Library
-General Public License, see the file `COPYING-LIB' in the source code
+General Public License, see the file `COPYING\-LIB' in the source code
 distribution.
 
 .SH Author
@@ -388,7 +388,7 @@ Anders Christensen, University of Trondh
 .SH Maintainer
 Changes to Regina since 0.07a, Mark Hessling
 <mark (at) rexx.org>
-with significant assistance from Florian Grosse-Coosmann.
+with significant assistance from Florian Grosse\-Coosmann.
 
 .SH See Also
 There are several good reference books on Rexx. The most famous is
