From 2461327901674af52cb19e73dbddfb7011268821 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 20 Oct 2011 17:51:52 +0200 Subject: fixed libdir in install --- makefiles/gmake/install.mk | 2 +- makefiles/gmake/platform.mk | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/makefiles/gmake/install.mk b/makefiles/gmake/install.mk index ac6d49d..fac8ac4 100644 --- a/makefiles/gmake/install.mk +++ b/makefiles/gmake/install.mk @@ -16,7 +16,7 @@ prefix=/usr execdir=$(DESTDIR)$(prefix) bindir=$(execdir)/bin sbindir=$(execdir)/sbin -libdir=$(execdir)/lib +libdir=$(execdir)/$(LIBDIR_ARCH) sysconfdir=$(execdir)/etc includedir=$(execdir)/include datadir=$(execdir)/share diff --git a/makefiles/gmake/platform.mk b/makefiles/gmake/platform.mk index df7c488..6f94216 100644 --- a/makefiles/gmake/platform.mk +++ b/makefiles/gmake/platform.mk @@ -30,21 +30,21 @@ endif # set library path on Intel/AMD ifeq "$(ARCH)" "x86" ifeq "$(LINUX_DIST)" "arch" -LIBDIR=/usr/lib32 +LIBDIR_ARCH=lib32 else -LIBDIR=/usr/lib +LIBDIR_ARCH=lib endif else -LIBDIR=/usr/lib +LIBDIR_ARCH=lib endif ifeq "$(ARCH)" "x86_64" ifeq "$(LINUX_DIST)" "arch" -LIBDIR=/usr/lib +LIBDIR_ARCH=lib else -LIBDIR=/usr/lib64 +LIBDIR_ARCH=lib64 endif else -LIBDIR=/usr/lib +LIBDIR_ARCH=lib endif # platform specific flags -- cgit v1.2.3-54-g00ecf