summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohn-Mark Bell <jmb@netsurf-browser.org>2023-12-19 00:42:38 +0000
committerJohn-Mark Bell <jmb@netsurf-browser.org>2023-12-19 00:42:38 +0000
commit8b8a4d55cecbbe47b147f6d26780de59af43d21c (patch)
tree970d42c94b9b98924c1264d1d3d006459b2ab32b /Makefile
parent010e6f49656412f75ea333ce5b3b412451aa654d (diff)
downloadiconv-master.tar.gz
iconv-master.tar.bz2
Fix testsuite now !Unicode is dynamicHEADmaster
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 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