Fix: Makefile uninstall target removes system directories (Bug #2830345)
git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@331 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
parent
8f5cf14b30
commit
be548a6446
27
src/src.pro
27
src/src.pro
|
@ -44,11 +44,24 @@ unix : !macx : !isEqual(QMAKE_WIN32,1){
|
|||
}
|
||||
TARGET = ../bin/keepassx
|
||||
target.path = $${PREFIX}/bin
|
||||
data.files += ../share/keepassx
|
||||
data.path = $${PREFIX}/share
|
||||
share.files = ../share/applications ../share/mime ../share/mimelnk ../share/pixmaps
|
||||
share.path = $${PREFIX}/share
|
||||
INSTALLS += share
|
||||
datai18n.files = ../share/keepassx/i18n/*.qm
|
||||
datai18n.path = $${PREFIX}/share/keepassx/i18n
|
||||
dataicons.files = ../share/keepassx/icons/*.png
|
||||
dataicons.path = $${PREFIX}/share/keepassx/icons
|
||||
datalicense.files = ../share/keepassx/license.html
|
||||
datalicense.path = $${PREFIX}/share/keepassx
|
||||
|
||||
shareapp.files = ../share/applications/*.desktop
|
||||
shareapp.path = $${PREFIX}/share/applications
|
||||
shararemime.files = ../share/mime/packages/*.xml
|
||||
shararemime.path = $${PREFIX}/share/mime/packages
|
||||
sharemimelnk.files = ../share/mimelnk/application/*.desktop
|
||||
sharemimelnk.path = $${PREFIX}/share/mimelnk/application
|
||||
sharepixmaps.files = ../share/pixmaps/*.xpm
|
||||
sharepixmaps.path = $${PREFIX}/share/pixmaps
|
||||
INSTALLS += datai18n dataicons datalicense
|
||||
INSTALLS += shareapp shararemime sharemimelnk sharepixmaps
|
||||
|
||||
contains(DEFINES,AUTOTYPE){
|
||||
LIBS += -lXtst
|
||||
SOURCES += lib/HelperX11.cpp lib/AutoTypeX11.cpp
|
||||
|
@ -71,6 +84,7 @@ macx {
|
|||
target.path = $${PREFIX}
|
||||
data.files += ../share/keepassx
|
||||
data.path = Contents/Resources
|
||||
INSTALLS += data
|
||||
LIBS += -framework CoreFoundation
|
||||
isEqual(LINK,DYNAMIC){
|
||||
isEmpty(QT_FRAMEWORK_DIR): QT_FRAMEWORK_DIR = /Library/Frameworks
|
||||
|
@ -105,6 +119,7 @@ isEqual(QMAKE_WIN32,1){
|
|||
target.path = $${PREFIX}
|
||||
data.files += ../share/keepassx/*
|
||||
data.path = $${PREFIX}/share
|
||||
INSTALLS += data
|
||||
!isEqual(INSTALL_QTLIB,0){
|
||||
qt_libs.files = $${QMAKE_LIBDIR_QT}/QtCore4.dll $${QMAKE_LIBDIR_QT}/QtGui4.dll $${QMAKE_LIBDIR_QT}/QtXml4.dll
|
||||
qt_libs.path = $${PREFIX}
|
||||
|
@ -115,7 +130,7 @@ isEqual(QMAKE_WIN32,1){
|
|||
# SOURCES += main_win32.cpp
|
||||
}
|
||||
|
||||
INSTALLS += target data
|
||||
INSTALLS += target
|
||||
|
||||
contains(DEFINES,GLOBAL_AUTOTYPE){
|
||||
FORMS += forms/AutoTypeDlg.ui forms/TargetWindowDlg.ui
|
||||
|
|
Loading…
Reference in New Issue