| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From da4170b61bb41eff0af170d1d77bfd90f9ebe5dd Mon Sep 17 00:00:00 2001 |
| 2 | From: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> |
| 3 | Date: Fri, 20 Jan 2012 11:34:42 +0100 |
| 4 | Subject: [PATCH] Fix installation of the icons when RESOLUTION is set |
| 5 | |
| 6 | When resolution is set, the following code(in fbreader/Makefile) is executed: |
| 7 | VARIANT = $(TARGET_ARCH) |
| 8 | ifneq "$(RESOLUTION)" "" |
| 9 | VARIANT = $(TARGET_ARCH)_$(RESOLUTION) |
| 10 | endif |
| 11 | |
| 12 | This fix is based on a patch from the openembedded project, |
| 13 | which can be found here: |
| 14 | http://cgit.openembedded.org/openembedded/tree/recipes/fbreader/fbreader-0.12.1/Makefile.patch |
| 15 | |
| 16 | Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> |
| 17 | --- |
| 18 | Submitted trough github to git://github.com/geometer/FBReader.git as a pull request |
| 19 | |
| 20 | fbreader/Makefile | 4 ++-- |
| 21 | 1 files changed, 2 insertions(+), 2 deletions(-) |
| 22 | |
| 23 | diff --git a/fbreader/Makefile b/fbreader/Makefile |
| 24 | index bfa9242..03e6cc3 100644 |
| 25 | --- a/fbreader/Makefile |
| 26 | +++ b/fbreader/Makefile |
| 27 | @@ -60,8 +60,8 @@ do_install: |
| 28 | @install -d $(FBSHAREDIR)/resources |
| 29 | @install -m 0644 $(wildcard data/resources/*.xml) $(FBSHAREDIR)/resources |
| 30 | @install -d $(DESTDIR)$(APPIMAGEDIR_REAL) |
| 31 | - @install -m 0644 $(wildcard data/icons/toolbar/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL) |
| 32 | - @install -m 0644 $(wildcard data/icons/filetree/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL) |
| 33 | + @install -m 0644 $(wildcard data/icons/toolbar/$(TARGET_ARCH)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL) |
| 34 | + @install -m 0644 $(wildcard data/icons/filetree/$(TARGET_ARCH)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL) |
| 35 | @install -m 0644 $(wildcard data/icons/booktree/new/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL) |
| 36 | @make -C $(TARGET_ARCH) RESOLUTION=$(RESOLUTION) install |
| 37 | |
| 38 | -- |
| 39 | 1.7.4.1 |
| 40 | |