[QScintilla] [PATCH] fix library installation
Dirk Mueller
dmueller at suse.de
Sat Aug 11 23:33:44 BST 2007
On Saturday, 11. August 2007, Phil Thompson wrote:
> > the patch below fixes "install" for QScintilla 1.73 for Qt3 and Qt4 for
> > me. Please consider adding it.
> What's broken?
The setting of DESTDIR causes it to try to write the install path
(e.g. /usr/lib) during "make", which fails. This is not so bad. Bad is
however that there is no install rule created, so the library will not be
installed at all. In addition the INSTALL_ROOT feature of qmake (needed for
binary packages) is not available. the patch fixes those isses by building
the library locally and then adding a install rule that also respects
$INSTALL_ROOT.
> I prefer to keep the Qt3 and Qt4 .pro files the same. (I hope nobody thinks
> that I maintain separate source files for both versions.)
Ah, ok. This diff should do it then:
--- qscintilla.pro
+++ qscintilla.pro
@@ -29,9 +29,9 @@
DEFINES = QSCINTILLA_MAKE_DLL QT SCI_LEXER
# Handle both Qt v4 and v3.
-DESTDIR = $$[QT_INSTALL_LIBS]
-isEmpty(DESTDIR) {
- DESTDIR = $(QTDIR)/lib
+target.path = $$[QT_INSTALL_LIBS]
+isEmpty(target.path) {
+ target.path = $(QTDIR)/lib
}
header.path = $$[QT_INSTALL_HEADERS]
@@ -53,7 +53,7 @@
qsci.path = $(QTDIR)
}
-INSTALLS += header trans qsci
+INSTALLS += header trans qsci target
HEADERS = \
./Qsci/qsciglobal.h \
More information about the QScintilla
mailing list