Commit 80468d99 authored by hjk's avatar hjk
Browse files

use 'lib64' instead of 'lib' on linux/x64_86

parent 380cb40f
#!/bin/sh #!/bin/sh
bindir=$(dirname "$0") bindir=$(dirname "$0")
libdir=$(cd ${bindir}/../lib ; pwd) if test "$(uname -m)" = "x86_64" ; then
libdir=$(cd ${bindir}/../lib64 ; pwd)
else
libdir=$(cd ${bindir}/../lib ; pwd)
fi
LD_LIBRARY_PATH="${libdir}:${LD_LIBRARY_PATH}" "${bindir}/qtcreator.bin" ${1+"$@"} LD_LIBRARY_PATH="${libdir}:${LD_LIBRARY_PATH}" "${bindir}/qtcreator.bin" ${1+"$@"}
...@@ -179,7 +179,11 @@ static inline QStringList getPluginPaths() ...@@ -179,7 +179,11 @@ static inline QStringList getPluginPaths()
// 1) "plugins" (Win/Linux) // 1) "plugins" (Win/Linux)
QString pluginPath = rootDirPath; QString pluginPath = rootDirPath;
pluginPath += QDir::separator(); pluginPath += QDir::separator();
#ifdef QT_ARCH_X86_64
pluginPath += QLatin1String("lib64");
#else
pluginPath += QLatin1String("lib"); pluginPath += QLatin1String("lib");
#endif
pluginPath += QDir::separator(); pluginPath += QDir::separator();
pluginPath += QLatin1String("qtcreator"); pluginPath += QLatin1String("qtcreator");
pluginPath += QDir::separator(); pluginPath += QDir::separator();
......
...@@ -6,6 +6,12 @@ isEmpty(TEST):CONFIG(debug, debug|release) { ...@@ -6,6 +6,12 @@ isEmpty(TEST):CONFIG(debug, debug|release) {
} }
} }
linux-g++-64 {
IDE_LIBRARY_BASENAME = lib64
} else {
IDE_LIBRARY_BASENAME = lib
}
equals(TEST, 1) { equals(TEST, 1) {
QT +=testlib QT +=testlib
DEFINES += WITH_TESTS DEFINES += WITH_TESTS
...@@ -21,7 +27,7 @@ macx { ...@@ -21,7 +27,7 @@ macx {
contains(QT_CONFIG, ppc):CONFIG += ppc x86 contains(QT_CONFIG, ppc):CONFIG += ppc x86
} else { } else {
IDE_APP_TARGET = qtcreator.bin IDE_APP_TARGET = qtcreator.bin
IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/lib/qtcreator IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins/ IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins/
} }
IDE_APP_PATH = $$IDE_BUILD_TREE/bin IDE_APP_PATH = $$IDE_BUILD_TREE/bin
......
...@@ -14,6 +14,6 @@ TARGET = $$qtLibraryTarget($$TARGET) ...@@ -14,6 +14,6 @@ TARGET = $$qtLibraryTarget($$TARGET)
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
linux-* { linux-* {
target.path = /lib/qtcreator target.path = /$$IDE_LIBRARY_BASENAME/qtcreator
INSTALLS += target INSTALLS += target
} }
...@@ -17,7 +17,7 @@ isEmpty(TARGET) { ...@@ -17,7 +17,7 @@ isEmpty(TARGET) {
error("qworkbenchplugin.pri: You must provide a TARGET") error("qworkbenchplugin.pri: You must provide a TARGET")
} }
# Copy the pluginspec file to the liberary directyory. # Copy the pluginspec file to the library directory.
# Note: On Windows/MinGW with some sh.exe in the path, # Note: On Windows/MinGW with some sh.exe in the path,
# QMAKE_COPY is some cp command that does not understand # QMAKE_COPY is some cp command that does not understand
# "\". Force the standard windows copy. # "\". Force the standard windows copy.
...@@ -54,8 +54,8 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols ...@@ -54,8 +54,8 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
CONFIG += plugin plugin_with_soname CONFIG += plugin plugin_with_soname
linux-* { linux-* {
target.path = /lib/qtcreator/plugins/$$PROVIDER target.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
pluginspec.files += $${TARGET}.pluginspec pluginspec.files += $${TARGET}.pluginspec
pluginspec.path = /lib/qtcreator/plugins/$$PROVIDER pluginspec.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
INSTALLS += target pluginspec INSTALLS += target pluginspec
} }
...@@ -3,7 +3,7 @@ macx { ...@@ -3,7 +3,7 @@ macx {
} else:linux-* { } else:linux-* {
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
# this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var
QMAKE_RPATHDIR += \$\$ORIGIN/../lib/qtcreator QMAKE_RPATHDIR += \$\$ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment