aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <igor.pashev@nexenta.com>2012-12-23 23:25:04 +0400
committerIgor Pashev <igor.pashev@nexenta.com>2012-12-23 23:44:45 +0400
commitad0007c674ec7a12c31777b009eb2019fe987efa (patch)
treea2366d5a583e062cd36ac0874bbb073e07598dac
parentf465c971eeae73f200931ff96eab26ed9b5acbc9 (diff)
downloadcibs-ad0007c674ec7a12c31777b009eb2019fe987efa.tar.gz
Use bits instead of variant for libdir
-rw-r--r--rules/autotools.mk2
-rw-r--r--rules/common.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/rules/autotools.mk b/rules/autotools.mk
index 4d284c4..0e51401 100644
--- a/rules/autotools.mk
+++ b/rules/autotools.mk
@@ -39,7 +39,7 @@ configure-env = \
configure-options = \
--prefix=$(prefix) \
- --libdir=\$${prefix}/lib$(lib-suffix.$(variant)) \
+ --libdir=\$${prefix}/lib$(lib-suffix.$(bits)) \
--bindir=\$${prefix}/bin \
--includedir=\$${prefix}/include \
--mandir=\$${prefix}/share/man \
diff --git a/rules/common.mk b/rules/common.mk
index 7de5728..3ab7f74 100644
--- a/rules/common.mk
+++ b/rules/common.mk
@@ -82,7 +82,7 @@ lib-suffix.noarch =
lib-suffix.32 =
lib-suffix.64 = /$(mach64)
-libdir = $(prefix)/lib$(lib-suffix.$(variant))
+libdir = $(prefix)/lib$(lib-suffix.$(bits))
PKG_CONFIG_PATH.32 = /usr/gnu/lib/$(mach32)/pkgconfig:/usr/lib/$(mach32)/pkgconfig
PKG_CONFIG_PATH.64 = /usr/gnu/lib/$(mach64)/pkgconfig:/usr/lib/$(mach64)/pkgconfig