From mboxrd@z Thu Jan  1 00:00:00 1970
From: rpeterso@sourceware.org <rpeterso@sourceware.org>
Date: 2 Aug 2006 15:09:47 -0000
Subject: [Cluster-devel] cluster/cman/make defines.mk.input
Message-ID: <20060802150947.16571.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

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@