diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2014-12-14 08:24:32 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2014-12-14 08:24:32 -0500 |
| commit | e571839e140139a6a819077e94cf8cc01c13b29f (patch) | |
| tree | 8263635257cfb5ed979a584a958103b700bf31e7 /SQLiteStudio3/dirs.pri | |
| parent | 407eac41f46936e3f346bb5a964a682e578b4237 (diff) | |
| parent | 89214766d8e3e7b8dd749a1fa18a5b9727f5010d (diff) | |
Merge tag 'upstream/3.0.0'
Upstream version 3.0.0
# gpg: Signature made Sun 14 Dec 2014 08:24:31 AM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.org>"
# gpg: aka "Unit 193 <unit193@ubuntu.com>"
Diffstat (limited to 'SQLiteStudio3/dirs.pri')
| -rw-r--r-- | SQLiteStudio3/dirs.pri | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/SQLiteStudio3/dirs.pri b/SQLiteStudio3/dirs.pri index be8479e..537d0c7 100644 --- a/SQLiteStudio3/dirs.pri +++ b/SQLiteStudio3/dirs.pri @@ -1,7 +1,10 @@ -DESTDIR = $$PWD/../output/SQLiteStudio -OBJECTS_DIR = $$PWD/../output/build -MOC_DIR = $$PWD/../output/build -UI_DIR = $$PWD/../output/build +OUTPUT_DIR_NAME = output +export(OUTPUT_DIR_NAME) + +DESTDIR = $$PWD/../$$OUTPUT_DIR_NAME/SQLiteStudio +OBJECTS_DIR = $$PWD/../$$OUTPUT_DIR_NAME/build +MOC_DIR = $$PWD/../$$OUTPUT_DIR_NAME/build +UI_DIR = $$PWD/../$$OUTPUT_DIR_NAME/build LIBS += -L$$DESTDIR @@ -21,7 +24,7 @@ INCLUDEPATH += $$PWD/coreSQLiteStudio DEPENDPATH += $$PWD/coreSQLiteStudio contains(QT, gui): { - INCLUDEPATH += $$PWD/guiSQLiteStudio $$PWD/../output/build/guiSQLiteStudio + INCLUDEPATH += $$PWD/guiSQLiteStudio $$PWD/../$$OUTPUT_DIR_NAME/build/guiSQLiteStudio DEPENDPATH += $$PWD/guiSQLiteStudio } @@ -35,3 +38,14 @@ portable { LIBS += -L$$DESTDIR/lib } } + +unix: { + isEmpty(LIBDIR) { + LIBDIR = /usr/lib + } + export(LIBDIR) + isEmpty(BINDIR) { + BINDIR = /usr/bin + } + export(BINDIR) +} |