From 0d49fff8d617d389966ac509cef1e3a5b4279a24 Mon Sep 17 00:00:00 2001 From: Jim Klimov <jim@jimklimov.com> Date: Mon, 18 Jul 2016 10:37:35 +0200 Subject: [PATCH] Extend shared-macros.mk KERNEL variables with 32-bit variants (same as base) just to ease usage with $(BITS) expansions --- make-rules/shared-macros.mk | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/make-rules/shared-macros.mk b/make-rules/shared-macros.mk index fcaabbd..62546fb 100644 --- a/make-rules/shared-macros.mk +++ b/make-rules/shared-macros.mk @@ -122,6 +122,7 @@ LIBDIR = /lib VARDIR = /var KERNELDRVDIR = /kernel/drv +KERNELDRVDIR32 =/kernel/drv KERNELDRVDIR64 =/kernel/drv/$(MACH64) USRBINDIR = $(USRDIR)/bin USRBINDIR32 = $(USRDIR)/bin/$(MACH32) @@ -143,6 +144,7 @@ USRSHAREMAN4DIR = $(USRSHAREMANDIR)/man4 USRSHAREMAN5DIR = $(USRSHAREMANDIR)/man5 USRKERNELDRVDIR = $(USRDIR)/kernel/drv +USRKERNELDRVDIR32 = $(USRDIR)/kernel/drv USRKERNELDRVDIR64 = $(USRDIR)/kernel/drv/$(MACH64) PROTOETCDIR = $(PROTO_DIR)/$(ETCDIR) @@ -152,7 +154,8 @@ PROTOSBINDIR = $(PROTO_DIR)/$(SBINDIR) PROTOLIBDIR = $(PROTO_DIR)/$(LIBDIR) PROTOVARDIR = $(PROTO_DIR)/$(VARDIR) -PROTOKERNELDRVDIR = $(PROTO_DIR)/$(KERNELDRVDIR) +PROTOKERNELDRVDIR = $(PROTO_DIR)/$(KERNELDRVDIR) +PROTOKERNELDRVDIR32 = $(PROTO_DIR)/$(KERNELDRVDIR32) PROTOKERNELDRVDIR64 = $(PROTO_DIR)/$(KERNELDRVDIR64) PROTOUSRBINDIR = $(PROTO_DIR)/$(USRBINDIR) PROTOUSRBINDIR32 = $(PROTO_DIR)/$(USRBINDIR32) @@ -173,7 +176,8 @@ PROTOUSRSHAREMAN4DIR = $(PROTO_DIR)/$(USRSHAREMAN4DIR) PROTOUSRSHAREMAN5DIR = $(PROTO_DIR)/$(USRSHAREMAN5DIR) PROTOUSRSHARELOCALEDIR = $(PROTO_DIR)/$(USRSHARELOCALEDIR) -PROTOUSRKERNELDRVDIR = $(PROTO_DIR)/$(USRKERNELDRVDIR) +PROTOUSRKERNELDRVDIR = $(PROTO_DIR)/$(USRKERNELDRVDIR) +PROTOUSRKERNELDRVDIR32 = $(PROTO_DIR)/$(USRKERNELDRVDIR32) PROTOUSRKERNELDRVDIR64 = $(PROTO_DIR)/$(USRKERNELDRVDIR64) -- Gitblit v1.9.3