Mercurial > mxe-octave
changeset 3756:bb70aeee012e
qt.mk: Remove kluge for SuSE 10 systems that's not needed now that we are building our own X11 libraries.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 09 Dec 2014 22:10:45 -0500 |
parents | bc32b686d0f5 |
children | 7a6637aa3aae |
files | configure.ac src/qt.mk |
diffstat | 2 files changed, 1 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Mon Dec 08 12:55:20 2014 -0500 +++ b/configure.ac Tue Dec 09 22:10:45 2014 -0500 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.62]) -AC_INIT([MXE-Octave], [0.0.33], [http://octave.org/bugs.html], [mxe-octave]) +AC_INIT([MXE-Octave], [0.0.34], [http://octave.org/bugs.html], [mxe-octave]) AC_CONFIG_SRCDIR([src/octave.mk]) AC_CONFIG_AUX_DIR([tools])
--- a/src/qt.mk Mon Dec 08 12:55:20 2014 -0500 +++ b/src/qt.mk Tue Dec 09 22:10:45 2014 -0500 @@ -123,11 +123,6 @@ define $(PKG)_BUILD ## syncqt needs QTDIR set to find the sources cd '$(1)' && QTDIR='$(1)' ./bin/syncqt - ## FIXME: LDFLAGS was not correct for SuSE 10.4 systems. Is there - ## a better way to handle this problem? - if [ -d '/usr/X11R6/lib64' ]; then \ - sed -i 's/PLATFORM=linux-g++/PLATFORM=linux-g++-64/' '$(1)/configure'; \ - fi cd '$(1)' && QTDIR='$(1)' \ $($(PKG)_CONFIGURE_ENV) \ ./$($(PKG)_CONFIGURE_CMD) \