From 3a24d51d437f386d4cc642c868321606129f0d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 7 Jul 2012 02:40:14 +0200 Subject: [PATCH] Fix 09_amd64_lib64.diff on Debian and Ubuntu --- .../lenny/dependencies/qt3/debian/patches/09_amd64_lib64.diff | 3 ++- .../dependencies/qt3/debian/patches/09_amd64_lib64.diff | 3 ++- .../dependencies/qt3/debian/patches/09_amd64_lib64.diff | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/lenny/dependencies/qt3/debian/patches/09_amd64_lib64.diff b/debian/lenny/dependencies/qt3/debian/patches/09_amd64_lib64.diff index 71b2b65e1..1708af1a2 100644 --- a/debian/lenny/dependencies/qt3/debian/patches/09_amd64_lib64.diff +++ b/debian/lenny/dependencies/qt3/debian/patches/09_amd64_lib64.diff @@ -7,7 +7,8 @@ -QMAKE_LIBDIR_X11 = /usr/X11R6/lib64 +QMAKE_LIBDIR_X11 = /usr/X11R6/lib QMAKE_INCDIR_QT = $(QTDIR)/include - QMAKE_LIBDIR_QT = $(QTDIR)/lib +-QMAKE_LIBDIR_QT = $(QTDIR)/lib64 ++QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include -QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 +QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/debian/squeeze/dependencies/qt3/debian/patches/09_amd64_lib64.diff b/debian/squeeze/dependencies/qt3/debian/patches/09_amd64_lib64.diff index 71b2b65e1..1708af1a2 100644 --- a/debian/squeeze/dependencies/qt3/debian/patches/09_amd64_lib64.diff +++ b/debian/squeeze/dependencies/qt3/debian/patches/09_amd64_lib64.diff @@ -7,7 +7,8 @@ -QMAKE_LIBDIR_X11 = /usr/X11R6/lib64 +QMAKE_LIBDIR_X11 = /usr/X11R6/lib QMAKE_INCDIR_QT = $(QTDIR)/include - QMAKE_LIBDIR_QT = $(QTDIR)/lib +-QMAKE_LIBDIR_QT = $(QTDIR)/lib64 ++QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include -QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 +QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib diff --git a/ubuntu/maverick/dependencies/qt3/debian/patches/09_amd64_lib64.diff b/ubuntu/maverick/dependencies/qt3/debian/patches/09_amd64_lib64.diff index 71b2b65e1..1708af1a2 100644 --- a/ubuntu/maverick/dependencies/qt3/debian/patches/09_amd64_lib64.diff +++ b/ubuntu/maverick/dependencies/qt3/debian/patches/09_amd64_lib64.diff @@ -7,7 +7,8 @@ -QMAKE_LIBDIR_X11 = /usr/X11R6/lib64 +QMAKE_LIBDIR_X11 = /usr/X11R6/lib QMAKE_INCDIR_QT = $(QTDIR)/include - QMAKE_LIBDIR_QT = $(QTDIR)/lib +-QMAKE_LIBDIR_QT = $(QTDIR)/lib64 ++QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include -QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 +QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib