mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-03 17:18:23 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #350 from selmf/develop

Browse Source 
Unix: Fix regression in translation install target
This commit is contained in:
Luis Ángel San Martín 2022-10-31 17:47:18 +01:00 committed by GitHub
commit 7ed8426cad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
YACReader/YACReader.pro
View File

@ -214,28 +214,16 @@ win32 {
$(COPY) $$shell_path($${SOURCE_QM_DIR}) $$shell_path($${DEPLOYMENT_OUT_QM_DIR}) $(COPY) $$shell_path($${SOURCE_QM_DIR}) $$shell_path($${DEPLOYMENT_OUT_QM_DIR})
} else { } else {
LRELEASE_DIR = ../release/languages/ LRELEASE_DIR = ../release/languages/
QM_FILES_INSTALL_PATH = $$DATADIR/yacreader/languages
} }
unix:!macx { unix:!macx {
# set install prefix if it's empty
isEmpty(PREFIX) {
PREFIX = /usr
}
isEmpty(BINDIR) {
BINDIR = $$PREFIX/bin
}
isEmpty(LIBDIR) {
LIBDIR = $$PREFIX/lib
}
isEmpty(DATADIR) {
DATADIR = $$PREFIX/share
}
DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\""
#MAKE INSTALL #MAKE INSTALL
INSTALLS += bin docs icon desktop translation manpage INSTALLS += bin docs icon desktop manpage
bin.path = $$BINDIR bin.path = $$BINDIR
isEmpty(DESTDIR) { isEmpty(DESTDIR) {
@ -256,9 +244,6 @@ icon.files = ../YACReader.svg
desktop.path = $$DATADIR/applications desktop.path = $$DATADIR/applications
desktop.files = ../YACReader.desktop desktop.files = ../YACReader.desktop
translation.path = $$DATADIR/yacreader/languages
translation.files = ../release/languages/yacreader_*
manpage.path = $$DATADIR/man/man1 manpage.path = $$DATADIR/man/man1
manpage.files = ../YACReader.1 manpage.files = ../YACReader.1

19
YACReaderLibrary/YACReaderLibrary.pro
View File

@ -307,6 +307,7 @@ win32 {
$(COPY) $$shell_path($${SOURCE_QM_DIR}) $$shell_path($${DEPLOYMENT_OUT_QM_DIR}) $(COPY) $$shell_path($${SOURCE_QM_DIR}) $$shell_path($${DEPLOYMENT_OUT_QM_DIR})
} else { } else {
LRELEASE_DIR = ../release/languages/ LRELEASE_DIR = ../release/languages/
QM_FILES_INSTALL_PATH = $$DATADIR/yacreader/languages
} }
#QML/GridView #QML/GridView
@ -328,24 +329,11 @@ unix:!macx:RESOURCES += qml_win.qrc
macx:RESOURCES += qml_osx.qrc macx:RESOURCES += qml_osx.qrc
unix:!macx { unix:!macx {
#set install prefix if it's empty
isEmpty(PREFIX) {
PREFIX = /usr
}
isEmpty(BINDIR) {
BINDIR = $$PREFIX/bin
}
isEmpty(LIBDIR) {
LIBDIR = $$PREFIX/lib
}
isEmpty(DATADIR) {
DATADIR = $$PREFIX/share
}
DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\"" DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\""
#MAKE INSTALL #MAKE INSTALL
INSTALLS += bin icon desktop server translation manpage INSTALLS += bin icon desktop server manpage
bin.path = $$BINDIR bin.path = $$BINDIR
isEmpty(DESTDIR) { isEmpty(DESTDIR) {
@ -363,9 +351,6 @@ icon.files = ../YACReaderLibrary.svg
desktop.path = $$DATADIR/applications desktop.path = $$DATADIR/applications
desktop.files = ../YACReaderLibrary.desktop desktop.files = ../YACReaderLibrary.desktop
translation.path = $$DATADIR/yacreader/languages
translation.files = ../release/languages/yacreaderlibrary_*
manpage.path = $$DATADIR/man/man1 manpage.path = $$DATADIR/man/man1
manpage.files = ../YACReaderLibrary.1 manpage.files = ../YACReaderLibrary.1
} }

12
YACReaderLibraryServer/YACReaderLibraryServer.pro
View File

@ -130,13 +130,6 @@ contains(QMAKE_TARGET.arch, x86_64) {
unix:!macx { unix:!macx {
#set install prefix if it's empty #set install prefix if it's empty
isEmpty(PREFIX) {
PREFIX = /usr
}
BINDIR = $$PREFIX/bin
LIBDIR = $$PREFIX/lib
DATADIR = $$PREFIX/share
DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\"" DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\""
@ -150,7 +143,7 @@ DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$
} }
CONFIG(server_standalone) { CONFIG(server_standalone) {
INSTALLS += bin server translation systemd INSTALLS += bin server systemd
} }
else:CONFIG(server_bundled) { else:CONFIG(server_bundled) {
INSTALLS += bin systemd INSTALLS += bin systemd
@ -169,9 +162,6 @@ server.files = ../release/server
systemd.path = $$LIBDIR/systemd/user systemd.path = $$LIBDIR/systemd/user
systemd.files = yacreaderlibraryserver.service systemd.files = yacreaderlibraryserver.service
translation.path = $$DATADIR/yacreader/languages
translation.files = ../release/languages/yacreaderlibrary_*
# TODO: We need a manpage for yaclibserver # TODO: We need a manpage for yaclibserver
#manpage.path = $$DATADIR/man/man1 #manpage.path = $$DATADIR/man/man1
#manpage.files = ../YACReaderLibrary.1 #manpage.files = ../YACReaderLibrary.1

16
config.pri
View File

@ -93,4 +93,20 @@ macx:!CONFIG(pdfkit):!CONFIG(pdfium):!CONFIG(no_pdf) {
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050900 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050900
} }
unix:!macx {
# set install prefix if it's empty
isEmpty(PREFIX) {
PREFIX = /usr
}
isEmpty(BINDIR) {
BINDIR = $$PREFIX/bin
}
isEmpty(LIBDIR) {
LIBDIR = $$PREFIX/lib
}
isEmpty(DATADIR) {
DATADIR = $$PREFIX/share
}
}
DEFINES += QT_DEPRECATED_WARNINGS DEFINES += QT_DEPRECATED_WARNINGS