summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/microwin/microwin.mk17
1 files changed, 12 insertions, 5 deletions
diff --git a/package/microwin/microwin.mk b/package/microwin/microwin.mk
index ffc1ff7b8..039e324b4 100644
--- a/package/microwin/microwin.mk
+++ b/package/microwin/microwin.mk
@@ -13,6 +13,7 @@ MICROWIN_DIR:=$(BUILD_DIR)/microwin
MICROWIN_CAT:=$(ZCAT)
MICROWIN_BINARY:=$(MICROWIN_DIR)/src/bin/nano-X
MICROWIN_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/nano-X
+MICROWIN_VERSION=$(subst $(MICROWIN_DIR)/microwindows-,,$(wildcard $(MICROWIN_DIR)/microwindows-*))
MICROWIN_CONFIG:=$(MICROWIN_DIR)/src/Configs/config.uclibc
@@ -22,10 +23,16 @@ $(DL_DIR)/$(MICROWIN_SOURCE):
microwin-source: $(DL_DIR)/$(MICROWIN_SOURCE)
$(MICROWIN_DIR)/.unpacked: $(DL_DIR)/$(MICROWIN_SOURCE)
- $(MICROWIN_CAT) $(DL_DIR)/$(MICROWIN_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ [ -d $(MICROWIN_DIR) ] || mkdir $(MICROWIN_DIR)
+ $(MICROWIN_CAT) $(DL_DIR)/$(MICROWIN_SOURCE) | tar -C $(MICROWIN_DIR) $(TAR_OPTIONS) -
touch $(MICROWIN_DIR)/.unpacked
-$(MICROWIN_DIR)/.configured: $(MICROWIN_DIR)/.unpacked
+$(MICROWIN_DIR)/.prepared: $(MICROWIN_DIR)/.unpacked
+ mv $(MICROWIN_DIR)/microwindows-$(MICROWIN_VERSION)/* $(MICROWIN_DIR)
+ toolchain/patch-kernel.sh $(UEMACS_DIR) package/uemacs/ microwindows-$(MICROWIN_VERSION)\*.patch
+ touch $(MICROWIN_DIR)/.prepared
+
+$(MICROWIN_DIR)/.configured: $(MICROWIN_DIR)/.prepared
(cd $(MICROWIN_DIR); \
);
touch $(MICROWIN_DIR)/.configured
@@ -49,6 +56,6 @@ microwin-dirclean:
# Toplevel Makefile options
#
#############################################################
-#ifeq ($(strip $(BR2_PACKAGE_MICROWIN)),y)
-#TARGETS+=microwin
-#endif
+ifeq ($(strip $(BR2_PACKAGE_MICROWIN)),y)
+TARGETS+=microwin
+endif