--- cdf36_4-dist/Makefile.orig	2017-03-20 21:09:02.000000000 +0100
+++ cdf36_4-dist/Makefile	2018-05-16 19:17:48.324239219 +0200
@@ -824,7 +824,7 @@
 "CURSES=$(AND.$(CURSES).$(CURSES_$(OS)_$(ENV)))" \
 "CCx=$(CC_$(OS)_$(ENV))" \
 "MAKE=$(MAKE)" \
-"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
+"COPTIONS=$(UCOPTIONS) $(COPTIONS_$(OS)_$(ENV))" \
 "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
 "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
 "CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))" \
@@ -837,7 +837,7 @@
 "SHARED=$(AND.$(SHARED).$(SHARED_$(OS)))" \
 "FOPTIONS=$(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
 "FOPTIONSld=$(FOPTIONSld_$(OS)) $(FOPTIONSld_$(OS)_$(ENV))" \
-"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
+"COPTIONS=$(UCOPTIONS) $(COPTIONS_$(OS)_$(ENV))" \
 "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
 "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
 "SHAREDEXT=$(SHAREDEXT_$(OS))" \