diff options
| -rw-r--r-- | Config.mk | 2 | ||||
| -rw-r--r-- | config/StdGNU.mk | 6 | ||||
| -rw-r--r-- | config/SunOS.mk | 6 | ||||
| -rw-r--r-- | config/x86_64.mk | 1 | ||||
| -rw-r--r-- | tools/Rules.mk | 2 |
5 files changed, 11 insertions, 6 deletions
@@ -30,7 +30,7 @@ include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk ifneq ($(EXTRA_PREFIX),) EXTRA_INCLUDES += $(EXTRA_PREFIX)/include -EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR) +EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBLEAFDIR) endif # cc-option: Check if compiler supports first option, else fall back to second. diff --git a/config/StdGNU.mk b/config/StdGNU.mk index ed383cf25d..a26ce17c84 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -20,8 +20,10 @@ INSTALL_PROG = $(INSTALL) -m0755 -p PREFIX ?= /usr BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include -LIBDIR = $(PREFIX)/lib -LIBDIR_x86_64 = $(PREFIX)/lib64 +LIBLEAFDIR = lib +LIBLEAFDIR_x86_64 = lib64 +LIBDIR = $(PREFIX)/$(LIBLEAFDIR) +LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64) MANDIR = $(PREFIX)/share/man MAN1DIR = $(MANDIR)/man1 MAN8DIR = $(MANDIR)/man8 diff --git a/config/SunOS.mk b/config/SunOS.mk index 16163b6820..d5eba747bf 100644 --- a/config/SunOS.mk +++ b/config/SunOS.mk @@ -21,8 +21,10 @@ INSTALL_PROG = $(INSTALL) -m0755 -p PREFIX ?= /usr BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include -LIBDIR = $(PREFIX)/lib -LIBDIR_x86_64 = $(PREFIX)/lib/amd64 +LIBLEAFDIR = lib +LIBLEAFDIR_x86_64 = lib/amd64 +LIBDIR = $(PREFIX)/$(LIBLEAFDIR) +LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64) MANDIR = $(PREFIX)/share/man MAN1DIR = $(MANDIR)/man1 MAN8DIR = $(MANDIR)/man8 diff --git a/config/x86_64.mk b/config/x86_64.mk index 64291837a4..6f77053df3 100644 --- a/config/x86_64.mk +++ b/config/x86_64.mk @@ -10,6 +10,7 @@ CONFIG_IOEMU := y CFLAGS += -m64 +LIBLEAFDIR = $(LIBLEAFDIR_x86_64) LIBDIR = $(LIBDIR_x86_64) SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64) diff --git a/tools/Rules.mk b/tools/Rules.mk index 1b16c9230c..ceb616981e 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -22,7 +22,7 @@ LDFLAGS_libxenguest = -L$(XEN_LIBXC) -lxenguest CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_include) LDFLAGS_libxenstore = -L$(XEN_XENSTORE) -lxenstore -X11_LDPATH = -L/usr/X11R6/$(LIBDIR) +X11_LDPATH = -L/usr/X11R6/$(LIBLEAFDIR) CFLAGS += -D__XEN_TOOLS__ |