Bläddra i källkod

Allow selection of individual Liberation font sets

We don't always want all the font sets on small systems.

[Peter: cleanup Config.in, ensure target dir gets created first]
Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Charles Manning 12 år sedan
förälder
incheckning
73f7994e53
2 ändrade filer med 36 tillägg och 1 borttagningar
  1. 15 0
      package/liberation/Config.in
  2. 21 1
      package/liberation/liberation.mk

+ 15 - 0
package/liberation/Config.in

@@ -5,3 +5,18 @@ 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_MONO
+	bool "mono fonts"
+	default y
+
+config BR2_PACKAGE_LIBERATION_SANS
+	bool "sans fonts"
+	default y
+
+config BR2_PACKAGE_LIBERATION_SERIF
+	bool "serif fonts"
+	default y
+
+endif

+ 21 - 1
package/liberation/liberation.mk

@@ -9,9 +9,29 @@ LIBERATION_SOURCE = liberation-fonts-ttf-$(LIBERATION_VERSION).tar.gz
 
 LIBERATION_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/liberation
 
+ifeq ($(BR2_PACKAGE_LIBERATION_MONO),y)
+define LIBERATION_INSTALL_MONO
+	$(INSTALL) -m 644 $(@D)/LiberationMono*.ttf $(LIBERATION_TARGET_DIR)
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_LIBERATION_SANS),y)
+define LIBERATION_INSTALL_SANS
+	$(INSTALL) -m 644 $(@D)/LiberationSans*.ttf $(LIBERATION_TARGET_DIR)
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_LIBERATION_SERIF),y)
+define LIBERATION_INSTALL_SERIF
+	$(INSTALL) -m 644 $(@D)/LiberationSerif*.ttf $(LIBERATION_TARGET_DIR)
+endef
+endif
+
 define LIBERATION_INSTALL_TARGET_CMDS
 	mkdir -p $(LIBERATION_TARGET_DIR)
-	$(INSTALL) -m 644 $(@D)/*.ttf $(LIBERATION_TARGET_DIR)
+	$(LIBERATION_INSTALL_MONO)
+	$(LIBERATION_INSTALL_SANS)
+	$(LIBERATION_INSTALL_SERIF)
 endef
 
 define LIBERATION_CLEAN_CMDS