From 2d948f085ae999fc0f15a0286f668431840a5b37 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Fri, 23 Dec 2011 22:41:36 +0100 Subject: fixed LIBDIR in libdir and renamed it --- 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 fac8ac4..c7564ac 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)/$(LIBDIR_ARCH) +libdir=$(execdir)/$(LIBDIR) sysconfdir=$(execdir)/etc includedir=$(execdir)/include datadir=$(execdir)/share diff --git a/makefiles/gmake/platform.mk b/makefiles/gmake/platform.mk index 5c96dfc..f63980e 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_ARCH=lib32 +LIBDIR=lib32 else -LIBDIR_ARCH=lib +LIBDIR=lib endif else -LIBDIR_ARCH=lib +LIBDIR=lib endif ifeq "$(ARCH)" "x86_64" ifeq "$(LINUX_DIST)" "arch" -LIBDIR_ARCH=lib +LIBDIR=lib else -LIBDIR_ARCH=lib64 +LIBDIR=lib64 endif else -LIBDIR_ARCH=lib +LIBDIR=lib endif # platform specific flags -- cgit v1.2.3-54-g00ecf