liberation: cleanup and really fix continous rebuild

diff --git a/package/liberation/liberation.mk b/package/liberation/liberation.mk
index cadb4cec487c67a2fa323823fde6f7c82fcec705..6ece6af547b17e200dadf90ab572115567cdd6d4 100644 (file)
--- 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)