Mercurial > mxe-octave
comparison src/qt.mk @ 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 | cae03f269f78 |
children | c2abfa00fca5 |
comparison
equal
deleted
inserted
replaced
3755:bc32b686d0f5 | 3756:bb70aeee012e |
---|---|
121 endef | 121 endef |
122 | 122 |
123 define $(PKG)_BUILD | 123 define $(PKG)_BUILD |
124 ## syncqt needs QTDIR set to find the sources | 124 ## syncqt needs QTDIR set to find the sources |
125 cd '$(1)' && QTDIR='$(1)' ./bin/syncqt | 125 cd '$(1)' && QTDIR='$(1)' ./bin/syncqt |
126 ## FIXME: LDFLAGS was not correct for SuSE 10.4 systems. Is there | |
127 ## a better way to handle this problem? | |
128 if [ -d '/usr/X11R6/lib64' ]; then \ | |
129 sed -i 's/PLATFORM=linux-g++/PLATFORM=linux-g++-64/' '$(1)/configure'; \ | |
130 fi | |
131 cd '$(1)' && QTDIR='$(1)' \ | 126 cd '$(1)' && QTDIR='$(1)' \ |
132 $($(PKG)_CONFIGURE_ENV) \ | 127 $($(PKG)_CONFIGURE_ENV) \ |
133 ./$($(PKG)_CONFIGURE_CMD) \ | 128 ./$($(PKG)_CONFIGURE_CMD) \ |
134 $($(PKG)_CONFIGURE_INCLUDE_OPTION) \ | 129 $($(PKG)_CONFIGURE_INCLUDE_OPTION) \ |
135 $($(PKG)_CONFIGURE_LIBPATH_OPTION) \ | 130 $($(PKG)_CONFIGURE_LIBPATH_OPTION) \ |