diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/NetBSD.mk | 1 | ||||
| -rw-r--r-- | config/StdGNU.mk | 10 | ||||
| -rw-r--r-- | config/SunOS.mk | 4 | ||||
| -rw-r--r-- | config/Tools.mk.in | 3 | ||||
| -rw-r--r-- | config/x86_64.mk | 3 |
5 files changed, 4 insertions, 17 deletions
diff --git a/config/NetBSD.mk b/config/NetBSD.mk index 274bfb0107..12c8a349a1 100644 --- a/config/NetBSD.mk +++ b/config/NetBSD.mk @@ -1,7 +1,6 @@ include $(XEN_ROOT)/config/StdGNU.mk # Override settings for this OS -LIBLEAFDIR_x86_64 = lib LIBEXEC = $(PREFIX)/libexec PRIVATE_BINDIR = $(BINDIR) diff --git a/config/StdGNU.mk b/config/StdGNU.mk index e2f2e1ef36..b6adbbe422 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -32,19 +32,13 @@ INSTALL_PROG = $(INSTALL) -m0755 -p PREFIX ?= /usr BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include -LIBLEAFDIR = lib -LIBLEAFDIR_x86_32 = lib -LIBLEAFDIR_x86_64 ?= lib64 -LIBDIR = $(PREFIX)/$(LIBLEAFDIR) -LIBDIR_x86_32 = $(PREFIX)/$(LIBLEAFDIR_x86_32) -LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64) -LIBEXEC = $(LIBDIR_x86_32)/xen/bin +LIBEXEC = $(PREFIX)/lib/xen/bin SHAREDIR = $(PREFIX)/share MANDIR = $(SHAREDIR)/man MAN1DIR = $(MANDIR)/man1 MAN8DIR = $(MANDIR)/man8 SBINDIR = $(PREFIX)/sbin -XENFIRMWAREDIR = $(LIBDIR_x86_32)/xen/boot +XENFIRMWAREDIR = $(PREFIX)/lib/xen/boot PRIVATE_PREFIX = $(LIBDIR)/xen PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin diff --git a/config/SunOS.mk b/config/SunOS.mk index ba809f5f5b..2c528b7dc4 100644 --- a/config/SunOS.mk +++ b/config/SunOS.mk @@ -22,10 +22,6 @@ INSTALL_PROG = $(INSTALL) -m0755 -p PREFIX ?= /usr BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include -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/Tools.mk.in b/config/Tools.mk.in index 5b80359902..8a52bccda3 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -1,6 +1,7 @@ # Prefix and install folder PREFIX := @prefix@ -LIBLEAFDIR_x86_64 := @LIB_PATH@ +exec_prefix := @exec_prefix@ +LIBDIR := @libdir@ # A debug build of tools? debug := @debug@ diff --git a/config/x86_64.mk b/config/x86_64.mk index 6f77053df3..f9b21b14e4 100644 --- a/config/x86_64.mk +++ b/config/x86_64.mk @@ -10,9 +10,6 @@ CONFIG_IOEMU := y CFLAGS += -m64 -LIBLEAFDIR = $(LIBLEAFDIR_x86_64) -LIBDIR = $(LIBDIR_x86_64) - SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64) # Use only if calling $(LD) directly. |