* [Cluster-devel] cluster/cman/make defines.mk.input
@ 2006-08-02 15:09 rpeterso
0 siblings, 0 replies; only message in thread
From: rpeterso @ 2006-08-02 15:09 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: rpeterso at sourceware.org 2006-08-02 15:09:46
Modified files:
cman/make : defines.mk.input
Log message:
Fix compilation problems on x86_64 (link against /usr/lib
or /usr/lib64 depending on archetecture).
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/make/defines.mk.input.diff?cvsroot=cluster&r1=1.3&r2=1.4
--- cluster/cman/make/defines.mk.input 2006/02/24 09:11:08 1.3
+++ cluster/cman/make/defines.mk.input 2006/08/02 15:09:46 1.4
@@ -11,12 +11,19 @@
###############################################################################
###############################################################################
+ARCH=$(shell uname -p)
+
#Install Locations
sbindir ?= ${DESTDIR}/@SBINDIR@
mandir ?= ${DESTDIR}/@MANDIR@
+ifeq (,$(findstring 64,$(ARCH)))
libdir ?= ${DESTDIR}/@LIBDIR@
-libexecdir ?= ${DESTDIR}/@LIBEXECDIR@
ccslibdir ?= ${DESTDIR}/@CCSLIBDIR@
+else
+libdir ?= ${DESTDIR}/@LIBDIR at 64
+ccslibdir ?= ${DESTDIR}/@CCSLIBDIR at 64
+endif
+libexecdir ?= ${DESTDIR}/@LIBEXECDIR@
incdir ?= ${DESTDIR}/@INCDIR@
ccsincdir ?= ${DESTDIR}/@CCSINCDIR@
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2006-08-02 15:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-08-02 15:09 [Cluster-devel] cluster/cman/make defines.mk.input rpeterso
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.