diff --git a/common.mak b/common.mak index b9a9f546..bb6cdf06 100644 --- a/common.mak +++ b/common.mak @@ -194,12 +194,14 @@ ALL_CFLAGS = -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \ -DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \ -DS390_TOOLS_DATADIR=$(TOOLS_DATADIR) \ -DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \ + -DS390_TOOLS_BINDIR=$(BINDIR) \ $(CFLAGS) CXXFLAGS ?= $(DEFAULT_CFLAGS) $(OPT_FLAGS) ALL_CXXFLAGS = -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \ -DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \ -DS390_TOOLS_DATADIR=$(TOOLS_DATADIR) \ -DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \ + -DS390_TOOLS_BINDIR=$(BINDIR) \ $(CXXFLAGS) ALL_CPPFLAGS = -I $(rootdir)include $(CPPFLAGS) ALL_LDFLAGS = $(LDFLAGS) diff --git a/include/lib/zt_common.h b/include/lib/zt_common.h index e27b7b0a..c4864281 100644 --- a/include/lib/zt_common.h +++ b/include/lib/zt_common.h @@ -25,6 +25,7 @@ #define RELEASE_STRING STRINGIFY (S390_TOOLS_RELEASE) #define TOOLS_LIBDIR STRINGIFY (S390_TOOLS_LIBDIR) #define TOOLS_SYSCONFDIR STRINGIFY (S390_TOOLS_SYSCONFDIR) +#define TOOLS_BINDIR STRINGIFY (S390_TOOLS_BINDIR) #define __noreturn __attribute__((noreturn)) #define __packed __attribute__((packed)) diff --git a/zdev/include/path.h b/zdev/include/path.h index 5252bcf2..536ca066 100644 --- a/zdev/include/path.h +++ b/zdev/include/path.h @@ -27,7 +27,7 @@ #define PATH_PROC "/proc" #define PATH_UDEVADM "udevadm" -#define PATH_VMCP "/usr/sbin/vmcp" +#define PATH_VMCP TOOLS_BINDIR "/vmcp" #define PATH_IP "ip" #define PATH_ROOT "/"