Skip to contentSkip to conversation

liberation: add support for custom target directory

PATCH New Daniel Nyström 2 participants 4 messages Jan 12, 2011

lore
Share & tools
lore

Daniel Nyström

author
#0 lore raw

PATCH 1/2 liberation: add support for custom target directory

Signed-off-by Daniel Nystr?m <[email protected]>
---
 package/liberation/Config.in     |    9 +++++++++
 package/liberation/liberation.mk |    2 +-
 2 files changed, 10 insertions(+), 1 deletions(-)
package/liberation/Config.in +9 -0
index 48d4195..9295b4e 100644
@@ -5,3 +5,12 @@ config BR2_PACKAGE_LIBERATION
 	  three most commonly used fonts on Microsoft systems:
 	  Times New Roman, Arial, and Courier New.
 
+if BR2_PACKAGE_LIBERATION
+
+config BR2_PACKAGE_LIBERATION_INSTALL_DIR
+	string "Install directory"
+	default "/usr/share/fonts/liberation"
+	help
+	  Target directory where the fonts should be installed
+
+endif
package/liberation/liberation.mk +1 -1
index 89987d6..53b817d 100644
@@ -7,7 +7,7 @@ LIBERATION_VERSION = 1.06.0.20100721
 LIBERATION_SITE = http://www.fedorahosted.org/releases/l/i/liberation-fonts
 LIBERATION_SOURCE = liberation-fonts-ttf-$(LIBERATION_VERSION).tar.gz
 
-LIBERATION_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/liberation
+LIBERATION_TARGET_DIR = $(TARGET_DIR)/$(BR2_PACKAGE_LIBERATION_INSTALL_DIR)
 
 define LIBERATION_INSTALL_TARGET_CMDS
 	mkdir -p $(LIBERATION_TARGET_DIR)
Signature · 1 line
1.7.1
author
#1 lore raw

PATCH 2/2 liberation: fixed misspelled target uninstall macro name

Signed-off-by Daniel Nystr?m <[email protected]>
---
 package/liberation/liberation.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/liberation/liberation.mk +1 -1
index 53b817d..98587be 100644
@@ -14,7 +14,7 @@ define LIBERATION_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 644 $(@D)/*.ttf $(LIBERATION_TARGET_DIR)
 endef
 
-define LIBERATION_CLEAN_CMDS
+define LIBERATION_UNINSTALL_TARGET_CMDS
 	rm -rf $(LIBERATION_TARGET_DIR)
 endef
Signature · 1 line
1.7.1
#2 lore raw

PATCH 1/2 liberation: add support for custom target directory

In reply to Daniel Nyström

Hello,

package/liberation/Config.in config BR2_PACKAGE_LIBERATION · line 16

Quoted 9 lines · On Wed, 12 Jan 2011 12:03:14 +0100 Daniel Nystr?m…
package/liberation/Config.in +9 -0
+if BR2_PACKAGE_LIBERATION
+
+config BR2_PACKAGE_LIBERATION_INSTALL_DIR
+	string "Install directory"
+	default "/usr/share/fonts/liberation"
+	help
+	  Target directory where the fonts should be installed
+
+endif

Why would this be necessary ?

In other words, which use case is this solving ? If it's a general font location problem, maybe this should not be a Liberation-specific option.

Regards,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
author
#3 lore raw

PATCH 1/2 liberation: add support for custom target directory

2011/1/12 Thomas Petazzoni <[email protected]>:

Quoted 11 lines

package/liberation/Config.in config BR2_PACKAGE_LIBERATION · line 16

Quoted 9 lines
package/liberation/Config.in +9 -0
+if BR2_PACKAGE_LIBERATION
+
+config BR2_PACKAGE_LIBERATION_INSTALL_DIR
+ ? ? string "Install directory"
+ ? ? default "/usr/share/fonts/liberation"
+ ? ? help
+ ? ? ? Target directory where the fonts should be installed
+
+endif

Why would this be necessary ?

In my case, I'm running Nano-X/Microwindows which doesn't handle fonts in subdirs and therefore requires them being all installed in the same directory. This was actually inspired by Luca Ceresolis' Dejavu font contribution.

Quoted 2 lines

In other words, which use case is this solving ? If it's a general font location problem, maybe this should not be a Liberation-specific option.

In my opinion, letting default installation directory keep using font named subdir but still configurable would cover most cases.

/ Daniel