summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-04-07 21:04:23 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2009-04-07 21:04:23 +0000
commitf276b269181394b26fadcfcd5b768c1d4b57c405 (patch)
tree3e57d8cf9a06d31458a8e8822a61eb57b77cfcf6
parent76e5c2988f8213c5afcb7980cd0e9cd0b46c11f7 (diff)
liberation: cleanup and really fix continous rebuild
-rw-r--r--package/liberation/liberation.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/package/liberation/liberation.mk b/package/liberation/liberation.mk
index cadb4cec4..6ece6af54 100644
--- a/package/liberation/liberation.mk
+++ b/package/liberation/liberation.mk
@@ -8,6 +8,7 @@ LIBERATION_SITE = http://www.fedorahosted.org/releases/l/i/liberation-fonts
LIBERATION_SOURCE = liberation-fonts-$(LIBERATION_VERSION).tar.gz
LIBERATION_DIR = $(BUILD_DIR)/liberation-fonts-$(LIBERATION_VERSION)
LIBERATION_CAT:=$(ZCAT)
+LIBERATION_TARGET_DIR:=$(TARGET_DIR)/usr/share/fonts/liberation
$(DL_DIR)/$(LIBERATION_SOURCE):
$(call DOWNLOAD,$(LIBERATION_SITE),$(LIBERATION_SOURCE))
@@ -18,15 +19,15 @@ $(LIBERATION_DIR)/.unpacked: $(DL_DIR)/$(LIBERATION_SOURCE)
$(LIBERATION_CAT) $(DL_DIR)/$(LIBERATION_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $@
-$(TARGET_DIR)/usr/share/fonts/LiberationMono-Bold.ttf: $(LIBERATION_DIR)/.unpacked
- -mkdir -p $(TARGET_DIR)/usr/share/fonts/liberation
- $(INSTALL) -m0644 $(LIBERATION_DIR)/*.ttf $(TARGET_DIR)/usr/share/fonts/liberation/
+$(LIBERATION_TARGET_DIR)/LiberationMono-Bold.ttf: $(LIBERATION_DIR)/.unpacked
+ mkdir -p $(LIBERATION_TARGET_DIR)
+ $(INSTALL) -m0644 $(LIBERATION_DIR)/*.ttf $(LIBERATION_TARGET_DIR)
touch -c $@
-liberation: uclibc $(TARGET_DIR)/usr/share/fonts/LiberationMono-Bold.ttf
+liberation: uclibc $(LIBERATION_TARGET_DIR)/LiberationMono-Bold.ttf
liberation-clean:
- rm -rf $(TARGET_DIR)/usr/share/fonts/liberation/
+ rm -rf $(LIBERATION_TARGET_DIR)
liberation-dirclean:
rm -rf $(LIBERATION_DIR)