diff options
| author | Igor Pashev <igor.pashev@nexenta.com> | 2012-12-23 21:18:08 +0400 |
|---|---|---|
| committer | Igor Pashev <igor.pashev@nexenta.com> | 2012-12-23 21:19:10 +0400 |
| commit | 42c25d444af1863572547bd060efd7eb217f08d6 (patch) | |
| tree | 7196d34d6ccd374e786cb9197f5a4282c61ccda2 | |
| parent | 62668627d9ce5c091276e1640478f0df04c35c0f (diff) | |
| download | cibs-42c25d444af1863572547bd060efd7eb217f08d6.tar.gz | |
common.mk: define libsuffix (e. g. empty or /amd64); undefine bindir
| -rw-r--r-- | rules/autotools.mk | 8 | ||||
| -rw-r--r-- | rules/common.mk | 15 |
2 files changed, 10 insertions, 13 deletions
diff --git a/rules/autotools.mk b/rules/autotools.mk index afdf6e5..4d284c4 100644 --- a/rules/autotools.mk +++ b/rules/autotools.mk @@ -38,12 +38,12 @@ configure-env = \ configure-options = \ - --prefix="$(prefix)" \ - --libdir="$(libdir)" \ - --bindir="$(bindir)" \ + --prefix=$(prefix) \ + --libdir=\$${prefix}/lib$(lib-suffix.$(variant)) \ + --bindir=\$${prefix}/bin \ --includedir=\$${prefix}/include \ - --infodir=/usr/share/info \ --mandir=\$${prefix}/share/man \ + --infodir=/usr/share/info \ --localstatedir=/var \ $(configure-options.$(variant)) \ diff --git a/rules/common.mk b/rules/common.mk index 2811539..7de5728 100644 --- a/rules/common.mk +++ b/rules/common.mk @@ -77,21 +77,18 @@ export CFLAGS = -O2 $(CFLAGS.$(variant)) export CXXFLAGS = -O2 $(CXXFLAGS.$(variant)) prefix = /usr -libdir.32 = $(prefix)/lib/$(mach32) -libdir.64 = $(prefix)/lib/$(mach64) -bindir.32 = $(prefix)/bin -bindir.64 = $(prefix)/bin -includedir = /usr/include -libdir.noarch = $(prefix)/lib -bindir.noarch = $(prefix)/bin + +lib-suffix.noarch = +lib-suffix.32 = +lib-suffix.64 = /$(mach64) + +libdir = $(prefix)/lib$(lib-suffix.$(variant)) 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 export PKG_CONFIG_PATH = PKG_CONFIG_PATH.$(bits) # $(bits) are target-specific and defined in 32.mk or 64.mk -bindir = $(bindir.$(bits)) -libdir = $(libdir.$(bits)) CC = $(CC.$(bits)) CXX = $(CXX.$(bits)) |