thooge
/
keepassx1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
sniperbeamer 2009-08-26 08:42:18 +00:00
parent 8f5cf14b30
commit be548a6446
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/src.pro
View File

@ -44,11 +44,24 @@ unix : !macx : !isEqual(QMAKE_WIN32,1){
} }
TARGET = ../bin/keepassx TARGET = ../bin/keepassx
target.path = $${PREFIX}/bin target.path = $${PREFIX}/bin
data.files += ../share/keepassx datai18n.files = ../share/keepassx/i18n/*.qm
data.path = $${PREFIX}/share datai18n.path = $${PREFIX}/share/keepassx/i18n
share.files = ../share/applications ../share/mime ../share/mimelnk ../share/pixmaps dataicons.files = ../share/keepassx/icons/*.png
share.path = $${PREFIX}/share dataicons.path = $${PREFIX}/share/keepassx/icons
INSTALLS += share 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){ contains(DEFINES,AUTOTYPE){
LIBS += -lXtst LIBS += -lXtst
SOURCES += lib/HelperX11.cpp lib/AutoTypeX11.cpp SOURCES += lib/HelperX11.cpp lib/AutoTypeX11.cpp
@ -71,6 +84,7 @@ macx {
target.path = $${PREFIX} target.path = $${PREFIX}
data.files += ../share/keepassx data.files += ../share/keepassx
data.path = Contents/Resources data.path = Contents/Resources
INSTALLS += data
LIBS += -framework CoreFoundation LIBS += -framework CoreFoundation
isEqual(LINK,DYNAMIC){ isEqual(LINK,DYNAMIC){
isEmpty(QT_FRAMEWORK_DIR): QT_FRAMEWORK_DIR = /Library/Frameworks isEmpty(QT_FRAMEWORK_DIR): QT_FRAMEWORK_DIR = /Library/Frameworks
@ -105,6 +119,7 @@ isEqual(QMAKE_WIN32,1){
target.path = $${PREFIX} target.path = $${PREFIX}
data.files += ../share/keepassx/* data.files += ../share/keepassx/*
data.path = $${PREFIX}/share data.path = $${PREFIX}/share
INSTALLS += data
!isEqual(INSTALL_QTLIB,0){ !isEqual(INSTALL_QTLIB,0){
qt_libs.files = $${QMAKE_LIBDIR_QT}/QtCore4.dll $${QMAKE_LIBDIR_QT}/QtGui4.dll $${QMAKE_LIBDIR_QT}/QtXml4.dll qt_libs.files = $${QMAKE_LIBDIR_QT}/QtCore4.dll $${QMAKE_LIBDIR_QT}/QtGui4.dll $${QMAKE_LIBDIR_QT}/QtXml4.dll
qt_libs.path = $${PREFIX} qt_libs.path = $${PREFIX}
@ -115,7 +130,7 @@ isEqual(QMAKE_WIN32,1){
# SOURCES += main_win32.cpp # SOURCES += main_win32.cpp
} }
INSTALLS += target data INSTALLS += target
contains(DEFINES,GLOBAL_AUTOTYPE){ contains(DEFINES,GLOBAL_AUTOTYPE){
FORMS += forms/AutoTypeDlg.ui forms/TargetWindowDlg.ui FORMS += forms/AutoTypeDlg.ui forms/TargetWindowDlg.ui