Исправление правил сборки для ЗОСРВ "Нейтрино" редакции 2021

README.md

@@ -26,7 +26,7 @@ mc: pcre s-lang
 s-lang: pcre
 include recurse.mk
 EOF
-$ make CPULIST=x86 USE_INSTALL_ROOT=1 INSTALL_ROOT_nto=/tmp/mc install
+$ make CPULIST="x86 e2k" USE_INSTALL_ROOT=1 INSTALL_ROOT_nto=/tmp/mc install
 ```
 
 **Порт mc проверен на работоспособность условно и, вероятно, потребует дополнительной адаптации.**

common.mk

@@ -3,6 +3,7 @@ QCONFIG=qconfig.mk
 endif
 include $(QCONFIG)
 
+include $(MKFILES_ROOT)/qmacros.mk
 
 CONFIGUREFLAGS += --sysconfdir=/etc
 CONFIGUREFLAGS += --libexecdir=/lib
@@ -22,6 +23,11 @@ CONFIGUREFLAGS += --with-screen=slang
 CONFIGUREFLAGS += --without-x
 CONFIGUREFLAGS += samba_cv_HAVE_GETTIMEOFDAY_TZ=yes
 CONFIGUREFLAGS += ac_cv_func_getmntinfo="yes"
+CONFIGUREFLAGS += GLIB_CFLAGS=-I$(KPDA_TARGET)/usr/include/glib-2.0
+CONFIGUREFLAGS += GLIB_LIBS="-lglib-2.0"
+CONFIGUREFLAGS += --with-slang-includes=$(INSTALL_ROOT_nto)/$(CPUVARDIR)/usr/include
+CONFIGUREFLAGS += --with-slang-libs=$(INSTALL_ROOT_nto)/$(CPUVARDIR)/usr/lib
+CONFIGUREFLAGS += LDFLAGS=-L$(KPDA_TARGET)/$(CPU)/usr/lib
 
 LIBS += nbutil
 LIBS += socket
@@ -33,5 +39,8 @@ CPPFLAGS += -DREAL_UNIX_SYSTEM=1
 CPPFLAGS += -D_FILE_OFFSET_BITS=64
 CPPFLAGS += -include nbutil.h
 
+EXTRA_INCVPATH:=$(wildcard $(addprefix $(KPDA_TARGET)/$(CPUVARDIR)/,usr/include/ usr/include/glib-2.0/ /usr/lib/glib-2.0/include/))
+EXTRA_INCVPATH+=$(wildcard $(addprefix $(KPDA_TARGET)/,usr/include/ usr/include/glib-2.0/ ))
+
 include $(MKFILES_ROOT)/autotools.mk
 include $(MKFILES_ROOT)/qtargets.mk