Description: Compiler and linker flags adjustments.
Forwarded: not-needed
Author: Alen Zekulic <alen@nms.hr>

--- regina-rexx-3.5.orig/Makefile.in
+++ regina-rexx-3.5/Makefile.in
@@ -41,7 +41,7 @@
 CC  = @CC@
 RANLIB = @RANLIB@
 LN_S  = @LN_S@
-CFLAGS = @CFLAGS@
+CFLAGS = $(DEB_CFLAGS)
 LDFLAGS = @LDFLAGS@
 
 RANLIB_DYNAMIC = @RANLIB_DYNAMIC@
@@ -283,7 +283,7 @@
 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 config.guess config.sub gci_convert.h *.mtb regina-config rxstack.init.d $(LIBPRE)$(SHLFILE)$(LIBPST)
 
 #.SUFFIXES: .sho $(SUFFIXES)
 #
@@ -298,34 +298,28 @@
 $(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)
+	$(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) $(DYNAMIC_BINARY_LIBS)
+	$(PURIFY) $(CC) -o $@ regina.$(OBJ) -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) $(DYNAMIC_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)
 	$(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)
 	$(LIBEXE) $(LIBFLAGS) $(OBJECTS) client.$(OBJ) drexx.$(OBJ) rexxsaa.$(OBJ)
@@ -336,7 +330,7 @@
 	$(RANLIB_DYNAMIC)
 
 $(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI): $(SHOFILES)
-	$(SHL_LD) $(DYNAMIC_LIBRARY_LIBS)
+	$(SHL_LD)
 	-rm -f $(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI_MAJOR)
 	-$(LN_S) $(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI) $(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI_MAJOR)
 	-rm -f $(SHLPRE)$(SHLFILE)$(SHLPST)
@@ -923,7 +917,7 @@
 #	$(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) $(REGUTIL_TERM_LIB) $(BOTHLIBS)
+	$(LD_RXLIB_UTILA) $(REGUTILEXPORTS) $(REGUTILOBJ) -L. -lregina  $(REGUTIL_TERM_LIB)
 	$(RANLIB_DYNAMIC)
 
 
@@ -1206,7 +1200,7 @@
 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
@@ -1217,7 +1211,7 @@
 # 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.5.orig/configure
+++ regina-rexx-3.5/configure
@@ -6619,8 +6619,7 @@
    if test "$with_debug" = yes; then
       CFLAGS="${CFLAGS} -Wall"
    else
-#      CFLAGS="${CFLAGS} -O3 -Wall -fomit-frame-pointer -fno-strict-aliasing -Wno-char-subscripts"
-      CFLAGS="${CFLAGS} -O3 -Wall"
+      CFLAGS="${CFLAGS} -Wall"
    fi
 fi
 if test "$on_qnx4" = yes; then
@@ -9747,7 +9746,7 @@
                    LD_RXLIB_A1="$ac_cv_prog_CC -shared ${LDFLAGS} -o \$(@)"
                    LD_RXLIB_A2="$ac_cv_prog_CC -shared ${LDFLAGS} -o \$(@)"
                    LD_RXLIB_UTILA="$ac_cv_prog_CC -shared ${LDFLAGS} -o \$(@)"
-                   SHL_LD="$ac_cv_prog_CC -shared ${LDFLAGS} -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')'
+                   SHL_LD="$ac_cv_prog_CC -o ${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI) -shared ${LDFLAGS} ${SHL_SCRIPT} -Wl,-soname=${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI_MAJOR) \$(SHOFILES) -ldl"
                 else
                    LD_RXLIB_A1="ld -Bdynamic -Bshareable ${LDFLAGS} -o \$(@)"
                    LD_RXLIB_A2="ld -Bdynamic -Bshareable ${LDFLAGS} -o \$(@)"
@@ -9763,13 +9762,11 @@
                 LD_RXLIB_A1="${CC} -shared ${LDFLAGS} -o \$(@)"
                 LD_RXLIB_A2="${CC} -shared ${LDFLAGS} -o \$(@)"
                 LD_RXLIB_UTILA="${CC} -shared ${LDFLAGS} -o \$(@)"
-#                LD_RXLIB_B1="-L. -l${SHLFILE}"
-#                LD_RXLIB_B2="-L. -l${SHLFILE}"
                 LD_RXLIB_B1="${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI)"
                 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,-soname=${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI_MAJOR) \$(SHOFILES) -ldl"
                 SHL_BASE="${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI)"
                 OTHER_INSTALLS="installabilib"
                 USE_ABI="yes"
@@ -9782,7 +9779,7 @@
                 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 ${SHL_SCRIPT} -Wl,-soname=${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI_MAJOR) \$(SHOFILES) -lc"
+                SHL_LD="${CC} -o ${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI) -shared ${LDFLAGS} ${SHL_SCRIPT} -Wl,-soname=${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI_MAJOR) \$(SHOFILES) -ldl"
                 SHL_BASE="${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI)"
                 OTHER_INSTALLS="installabilib"
                 USE_ABI="yes"
--- regina-rexx-3.5.orig/regina.1
+++ regina-rexx-3.5/regina.1
@@ -292,7 +292,7 @@
 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
