diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-01-22 14:29:11 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-01-22 14:29:11 +0000 |
| commit | c8107e1564b783e344be4af53dd156a452c53eee (patch) | |
| tree | b24eb9f8614374b5b166233fc89dbd1307d70bde /config | |
| parent | 590e56fc113b8cbe3d4f0efe23b0690be1cb7bf1 (diff) | |
| download | xen-c8107e1564b783e344be4af53dd156a452c53eee.tar.gz xen-c8107e1564b783e344be4af53dd156a452c53eee.tar.bz2 xen-c8107e1564b783e344be4af53dd156a452c53eee.zip | |
Apply PREFIX directly to LIBDIR.
Signed-off-by: Bastian Blank <waldi@debian.org>
Diffstat (limited to 'config')
| -rw-r--r-- | config/StdGNU.mk | 4 | ||||
| -rw-r--r-- | config/SunOS.mk | 7 | ||||
| -rw-r--r-- | config/ia64.mk | 2 | ||||
| -rw-r--r-- | config/powerpc64.mk | 1 | ||||
| -rw-r--r-- | config/x86_32.mk | 1 | ||||
| -rw-r--r-- | config/x86_64.mk | 5 |
6 files changed, 11 insertions, 9 deletions
diff --git a/config/StdGNU.mk b/config/StdGNU.mk index d493ba7170..0399eb1b4b 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -18,8 +18,8 @@ INSTALL_DATA = $(INSTALL) -m0644 -p INSTALL_PROG = $(INSTALL) -m0755 -p PREFIX ?= /usr - -LIB64DIR = lib64 +LIBDIR = $(PREFIX)/lib +LIBDIR_x86_64 = $(PREFIX)/lib64 SOCKET_LIBS = CURSES_LIBS = -lncurses diff --git a/config/SunOS.mk b/config/SunOS.mk index e84e277761..ce104473fd 100644 --- a/config/SunOS.mk +++ b/config/SunOS.mk @@ -19,14 +19,17 @@ INSTALL_DATA = $(INSTALL) -m0644 -p INSTALL_PROG = $(INSTALL) -m0755 -p PREFIX ?= /usr +LIBDIR = $(PREFIX)/lib +LIBDIR_x86_64 = $(PREFIX)/lib/amd64 -LIB64DIR = lib/amd64 +SunOS_LIBDIR = /usr/sfw/lib +SunOS_LIBDIR_x86_64 = /usr/sfw/lib/amd64 SOCKET_LIBS = -lsocket CURSES_LIBS = -lcurses UTIL_LIBS = SONAME_LDFLAG = -h -SHLIB_CFLAGS = -R /usr/sfw/$(LIBDIR) -shared +SHLIB_CFLAGS = -R $(SunOS_LIBDIR) -shared ifneq ($(debug),y) # Optimisation flags are overridable diff --git a/config/ia64.mk b/config/ia64.mk index db40adeb12..50edf6313d 100644 --- a/config/ia64.mk +++ b/config/ia64.mk @@ -4,5 +4,3 @@ CONFIG_IA64_$(XEN_OS) := y CONFIG_IOEMU := y CONFIG_XCUTILS := y CONFIG_XENCOMM := y - -LIBDIR := lib diff --git a/config/powerpc64.mk b/config/powerpc64.mk index cba68fec19..a49efd876b 100644 --- a/config/powerpc64.mk +++ b/config/powerpc64.mk @@ -4,4 +4,3 @@ CONFIG_POWERPC_$(XEN_OS) := y CONFIG_XENCOMM := y CFLAGS += -DELFSIZE=64 -LIBDIR := lib diff --git a/config/x86_32.mk b/config/x86_32.mk index 9b8cee85b5..1f5cd6097d 100644 --- a/config/x86_32.mk +++ b/config/x86_32.mk @@ -8,7 +8,6 @@ CONFIG_XCUTILS := y CONFIG_IOEMU := y CFLAGS += -m32 -march=i686 -LIBDIR := lib # Use only if calling $(LD) directly. LDFLAGS_DIRECT_OpenBSD = _obsd diff --git a/config/x86_64.mk b/config/x86_64.mk index 288878638c..64291837a4 100644 --- a/config/x86_64.mk +++ b/config/x86_64.mk @@ -9,7 +9,10 @@ CONFIG_XCUTILS := y CONFIG_IOEMU := y CFLAGS += -m64 -LIBDIR = $(LIB64DIR) + +LIBDIR = $(LIBDIR_x86_64) + +SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64) # Use only if calling $(LD) directly. ifeq ($(XEN_OS),OpenBSD) |