summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--module/Makefile4
-rw-r--r--test/Makefile4
-rw-r--r--unicode/Makefile3
4 files changed, 15 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index c637391..b8d5db6 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,6 @@ include $(NSSHARED)/makefiles/Makefile.tools
TESTRUNNER := $(PERL) $(NSTESTTOOLS)/testrunner.pl
-ifneq ($(HOST),arm-unknown-riscos)
- export UNICODE_DIR := $(CURDIR)/riscos/!Boot/Resources/!Unicode/
-endif
-
# Toolchain flags
DISABLED_WARNINGS := -Wno-format -Wno-missing-braces -Wno-sign-compare \
-Wno-shift-negative-value -Wno-discarded-qualifiers \
@@ -28,6 +24,10 @@ CFLAGS := -std=c99 -D_DEFAULT_SOURCE -I$(CURDIR)/include/ \
include $(NSBUILD)/Makefile.top
+ifneq ($(HOST),arm-unknown-riscos)
+ export UNICODE_DIR := $(BUILDDIR)/unires
+endif
+
# Extra installation rules
I := /include/iconv
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/iconv/iconv.h
diff --git a/module/Makefile b/module/Makefile
index 86e68d8..5921e79 100644
--- a/module/Makefile
+++ b/module/Makefile
@@ -4,4 +4,8 @@ endif
DIR_TEST_ITEMS := iconv:module.c;menu.c;wrapper.c
+ifeq ($(filter $(BUILDDIR)/unires,$(TEST_PREREQS)),)
+ TEST_PREREQS := $(TEST_PREREQS) $(BUILDDIR)/unires
+endif
+
include $(NSBUILD)/Makefile.subdir
diff --git a/test/Makefile b/test/Makefile
index c5d298f..19e2924 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,4 +1,8 @@
# Tests
DIR_TEST_ITEMS := iconv:iconv.c nullable:nullable.c translit:translit.c
+ifeq ($(filter $(BUILDDIR)/unires,$(TEST_PREREQS)),)
+ TEST_PREREQS := $(TEST_PREREQS) $(BUILDDIR)/unires
+endif
+
include $(NSBUILD)/Makefile.subdir
diff --git a/unicode/Makefile b/unicode/Makefile
index db7d544..808c4b0 100644
--- a/unicode/Makefile
+++ b/unicode/Makefile
@@ -84,6 +84,9 @@ $(BUILDDIR)/unires: $(BUILDDIR)/Aliases $(wildcard unicode/Unicode/*)
$(Q)$(CP) unicode/Unicode/Resources/UK/!Help $@.tmp/!Help
$(Q)$(CP) unicode/Unicode/Resources/UK/!Run,feb $@.tmp/!Run,feb
$(Q)$(CP) -r unicode/Unicode/Resources/Encodings $@.tmp/Encodings
+ifeq ($(findstring -riscos,$(HOST)),)
+ $(Q)for f in $$(find $@.tmp/Encodings/ -name '*,ffd'); do mv $$f $${f%%,ffd}; done
+endif
$(Q)$(MKDIR) $@.tmp/Files
$(Q)$(CP) unicode/Unicode/data/CharNames $@.tmp/Files/CharNames
$(Q)$(CP) $(BUILDDIR)/Aliases $@.tmp/Files/Aliases