mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't install the actual icon files

Browse source 
They are loaded into a Qt resource and always accessed via it.

[Dirk Hohndel: had to hand edit / apply the changes to the .pri file]

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Thiago Macieira 2013-12-11 19:09:13 -08:00 committed by Dirk Hohndel
parent 76251c27da
commit ee5d8e3cfc
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/windows/subsurface.nsi.in
View file

@ -102,7 +102,6 @@ Section
File /r xslt File /r xslt
File /r data File /r data
File /r images File /r images
File /r icons
File /r plugins File /r plugins
File /r Documentation File /r Documentation
File /r translations File /r translations
@ -165,7 +164,6 @@ Section "Uninstall"
RMDir /r "$INSTDIR\share" RMDir /r "$INSTDIR\share"
RMDir /r "$INSTDIR\xslt" RMDir /r "$INSTDIR\xslt"
RMDir /r "$INSTDIR\data" RMDir /r "$INSTDIR\data"
RMDir /r "$INSTDIR\icons"
RMDir /r "$INSTDIR\images" RMDir /r "$INSTDIR\images"
RMDir /r "$INSTDIR\translations" RMDir /r "$INSTDIR\translations"
RMDir /r "$INSTDIR\oldshare" RMDir /r "$INSTDIR\oldshare"

10
subsurface-install.pri
View file

@ -1,6 +1,5 @@
marbledir.files = $$MARBLEDIR marbledir.files = $$MARBLEDIR
xslt.files = $$XSLT_FILES xslt.files = $$XSLT_FILES
icons.files = $$ICONS_FILES
doc.files = $$DOC_FILES doc.files = $$DOC_FILES
translation.files = $$replace(TRANSLATIONS, .ts, .qm) translation.files = $$replace(TRANSLATIONS, .ts, .qm)
exists($$[QT_INSTALL_TRANSLATIONS]) { exists($$[QT_INSTALL_TRANSLATIONS]) {
@ -56,7 +55,7 @@ mac {
doc.path = $$WINDOWSSTAGING/Documentation doc.path = $$WINDOWSSTAGING/Documentation
CONFIG -= copy_dir_files CONFIG -= copy_dir_files
deploy.path = $$WINDOWSSTAGING deploy.path = $$WINDOWSSTAGING
deploy.files += $$xslt.files $$icons.files deploy.files += $$xslt.files
deploy.CONFIG += no_check_exist deploy.CONFIG += no_check_exist
target.path = $$WINDOWSSTAGING target.path = $$WINDOWSSTAGING
marbledir.path = $$WINDOWSSTAGING/data marbledir.path = $$WINDOWSSTAGING/data
@ -134,8 +133,6 @@ BINDIR = $(prefix)/bin$${nl}\
DATADIR = $(prefix)/share$${nl}\ DATADIR = $(prefix)/share$${nl}\
DOCDIR = $(DATADIR)/doc/subsurface$${nl}\ DOCDIR = $(DATADIR)/doc/subsurface$${nl}\
DESKTOPDIR = $(DATADIR)/applications$${nl}\ DESKTOPDIR = $(DATADIR)/applications$${nl}\
ICONPATH = $(DATADIR)/icons/hicolor$${nl}\
ICONDIR = $(ICONPATH)/scalable/apps$${nl}\
MANDIR = $(DATADIR)/man/man1$${nl}\ MANDIR = $(DATADIR)/man/man1$${nl}\
XSLTDIR = $(DATADIR)/subsurface XSLTDIR = $(DATADIR)/subsurface
QMAKE_EXTRA_TARGETS += dummy QMAKE_EXTRA_TARGETS += dummy
@ -150,9 +147,6 @@ XSLTDIR = $(DATADIR)/subsurface
manpage.path = /$(MANDIR) manpage.path = /$(MANDIR)
manpage.files = $$MANPAGE manpage.files = $$MANPAGE
icon.path = /$(ICONDIR)
icon.files = $$ICON
xslt.path = /$(XSLTDIR) xslt.path = /$(XSLTDIR)
marbledir.path = /$(DATADIR)/subsurface/data marbledir.path = /$(DATADIR)/subsurface/data
doc.path = /$(DOCDIR) doc.path = /$(DOCDIR)
@ -162,7 +156,7 @@ XSLTDIR = $(DATADIR)/subsurface
translation.path = /$(DATADIR)/subsurface/translations translation.path = /$(DATADIR)/subsurface/translations
translation.CONFIG += no_check_exist translation.CONFIG += no_check_exist
INSTALLS += target desktop icon manpage xslt doc marbledir translation INSTALLS += target desktop manpage xslt doc marbledir translation
install.target = install install.target = install
} }
!isEmpty(TRANSLATIONS) { !isEmpty(TRANSLATIONS) {