projects / packages / qt.git / blame
| Commit | Line | Data |
|---|---|---|
| 95a29a75 JB |
1 | --- qt-x11-free-3.2.1/qmake/generators/unix/unixmake2.cpp.orig 2003-09-07 00:06:56.761045136 +0200 |
| 2 | +++ qt-x11-free-3.2.1/qmake/generators/unix/unixmake2.cpp 2003-09-07 00:06:17.088076344 +0200 | |
| 3 | @@ -1319,28 +1319,36 @@ | |
| 4 | } | |
| 5 | ||
| 6 | QString | |
| 7 | -UnixMakefileGenerator::libtoolFileName() | |
| 8 | +UnixMakefileGenerator::libShortName(int withlib /* = 0 */) | |
| 9 | { | |
| 10 | QString ret = var("TARGET"); | |
| 11 | int slsh = ret.findRev(Option::dir_sep); | |
| 12 | if(slsh != -1) | |
| 13 | - ret = ret.right(ret.length() - slsh); | |
| 14 | + ret = ret.mid(slsh + 1); | |
| 15 | + if(!withlib && ret.startsWith("lib")) | |
| 16 | + ret = ret.mid(3); | |
| 17 | int dot = ret.find('.'); | |
| 18 | if(dot != -1) | |
| 19 | ret = ret.left(dot); | |
| 20 | + return ret; | |
| 21 | +} | |
| 22 | + | |
| 23 | +QString | |
| 24 | +UnixMakefileGenerator::libtoolFileName() | |
| 25 | +{ | |
| 26 | + QString ret = libShortName(1); | |
| 27 | ret += Option::libtool_ext; | |
| 28 | - if(!project->isEmpty("DESTDIR")) | |
| 29 | + if(!project->isEmpty("DESTDIR")) { | |
| 30 | + ret.prepend(Option::dir_sep); | |
| 31 | ret.prepend(var("DESTDIR")); | |
| 32 | + } | |
| 33 | return ret; | |
| 34 | } | |
| 35 | ||
| 36 | void | |
| 37 | UnixMakefileGenerator::writeLibtoolFile() | |
| 38 | { | |
| 39 | - QString fname = libtoolFileName(), lname = fname; | |
| 40 | - int slsh = lname.findRev(Option::dir_sep); | |
| 41 | - if(slsh != -1) | |
| 42 | - lname = lname.right(lname.length() - slsh); | |
| 43 | + QString fname = libtoolFileName(), lname = libShortName(1); | |
| 44 | QFile ft(fname); | |
| 45 | if(!ft.open(IO_WriteOnly)) | |
| 46 | return; | |
| 47 | @@ -1406,17 +1414,10 @@ | |
| 48 | QString | |
| 49 | UnixMakefileGenerator::pkgConfigFileName() | |
| 50 | { | |
| 51 | - QString ret = var("TARGET"); | |
| 52 | - int slsh = ret.findRev(Option::dir_sep); | |
| 53 | - if(slsh != -1) | |
| 54 | - ret = ret.right(ret.length() - slsh); | |
| 55 | - if(ret.startsWith("lib")) | |
| 56 | - ret = ret.mid(3); | |
| 57 | - int dot = ret.find('.'); | |
| 58 | - if(dot != -1) | |
| 59 | - ret = ret.left(dot); | |
| 60 | + QString ret = libShortName(0); | |
| 61 | ret += Option::pkgcfg_ext; | |
| 62 | if(!project->isEmpty("DESTDIR")) { | |
| 63 | + ret.prepend(Option::dir_sep); | |
| 64 | ret.prepend(var("DESTDIR")); | |
| 65 | ret = Option::fixPathToLocalOS(fileFixify(ret,QDir::currentDirPath(), Option::output_dir)); | |
| 66 | } | |
| 67 | @@ -1426,10 +1427,7 @@ | |
| 68 | void | |
| 69 | UnixMakefileGenerator::writePkgConfigFile() // ### does make sense only for libqt so far | |
| 70 | { | |
| 71 | - QString fname = pkgConfigFileName(), lname = fname; | |
| 72 | - int slsh = lname.findRev(Option::dir_sep); | |
| 73 | - if(slsh != -1) | |
| 74 | - lname = lname.right(lname.length() - slsh); | |
| 75 | + QString fname = pkgConfigFileName(), lname = libShortName(0); | |
| 76 | QFile ft(fname); | |
| 77 | if(!ft.open(IO_WriteOnly)) | |
| 78 | return; | |
| 79 | --- qt-x11-free-3.2.1/qmake/generators/unix/unixmake.h.orig 2003-08-20 15:08:14.000000000 +0200 | |
| 80 | +++ qt-x11-free-3.2.1/qmake/generators/unix/unixmake.h 2003-09-07 00:19:11.653324528 +0200 | |
| 81 | @@ -43,6 +43,7 @@ | |
| 82 | bool init_flag, include_deps; | |
| 83 | bool writeMakefile(QTextStream &); | |
| 84 | void writeExtraVariables(QTextStream &); | |
| 85 | + QString libShortName(int withlib = 0); | |
| 86 | QString libtoolFileName(); | |
| 87 | void writeLibtoolFile(); // for libtool | |
| 88 | QString pkgConfigFileName(); |