diff options
| author |  Thiago Macieira <thiago@macieira.org> | 2013-12-11 19:09:13 -0800 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-12-12 08:00:41 +0100 |
| commit | ee5d8e3cfcb2380b20d5341cdbfb8078a5036f40 (patch) | |
| tree | be92a4fd9293d772ebc6ab5ea7e612e835397acf | |
| parent | 76251c27dac7d6a6fd8c4f28e06908b9b8946c1c (diff) | |
| download | subsurface-ee5d8e3cfcb2380b20d5341cdbfb8078a5036f40.tar.gz | |
Don't install the actual icon files
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>
| -rw-r--r-- | packaging/windows/subsurface.nsi.in | 2 | ||||
| -rw-r--r-- | subsurface-install.pri | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in index 272b53129..aa083828e 100644 --- a/packaging/windows/subsurface.nsi.in +++ b/packaging/windows/subsurface.nsi.in @@ -102,7 +102,6 @@ Section File /r xslt File /r data File /r images - File /r icons File /r plugins File /r Documentation File /r translations @@ -165,7 +164,6 @@ Section "Uninstall" RMDir /r "$INSTDIR\share" RMDir /r "$INSTDIR\xslt" RMDir /r "$INSTDIR\data" - RMDir /r "$INSTDIR\icons" RMDir /r "$INSTDIR\images" RMDir /r "$INSTDIR\translations" RMDir /r "$INSTDIR\oldshare" diff --git a/subsurface-install.pri b/subsurface-install.pri index 1fdacbed2..01517ee81 100644 --- a/subsurface-install.pri +++ b/subsurface-install.pri @@ -1,6 +1,5 @@ marbledir.files = $$MARBLEDIR xslt.files = $$XSLT_FILES -icons.files = $$ICONS_FILES doc.files = $$DOC_FILES translation.files = $$replace(TRANSLATIONS, .ts, .qm) exists($$[QT_INSTALL_TRANSLATIONS]) { @@ -56,7 +55,7 @@ mac { doc.path = $$WINDOWSSTAGING/Documentation CONFIG -= copy_dir_files deploy.path = $$WINDOWSSTAGING - deploy.files += $$xslt.files $$icons.files + deploy.files += $$xslt.files deploy.CONFIG += no_check_exist target.path = $$WINDOWSSTAGING marbledir.path = $$WINDOWSSTAGING/data @@ -134,8 +133,6 @@ BINDIR = $(prefix)/bin$${nl}\ DATADIR = $(prefix)/share$${nl}\ DOCDIR = $(DATADIR)/doc/subsurface$${nl}\ DESKTOPDIR = $(DATADIR)/applications$${nl}\ -ICONPATH = $(DATADIR)/icons/hicolor$${nl}\ -ICONDIR = $(ICONPATH)/scalable/apps$${nl}\ MANDIR = $(DATADIR)/man/man1$${nl}\ XSLTDIR = $(DATADIR)/subsurface QMAKE_EXTRA_TARGETS += dummy @@ -150,9 +147,6 @@ XSLTDIR = $(DATADIR)/subsurface manpage.path = /$(MANDIR) manpage.files = $$MANPAGE - icon.path = /$(ICONDIR) - icon.files = $$ICON - xslt.path = /$(XSLTDIR) marbledir.path = /$(DATADIR)/subsurface/data doc.path = /$(DOCDIR) @@ -162,7 +156,7 @@ XSLTDIR = $(DATADIR)/subsurface translation.path = /$(DATADIR)/subsurface/translations 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 } !isEmpty(TRANSLATIONS) { |