From mboxrd@z Thu Jan  1 00:00:00 1970
From: cfeist@sourceware.org <cfeist@sourceware.org>
Date: 4 Aug 2006 16:54:02 -0000
Subject: [Cluster-devel] cluster cman/make/defines.mk.input group/make/ ...
Message-ID: <20060804165402.5930.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:	cfeist at sourceware.org	2006-08-04 16:54:01

Modified files:
	cman/make      : defines.mk.input 
	group/make     : defines.mk.input 

Log message:
	Reverted changes to fix 64 bit arch building.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/make/defines.mk.input.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/make/defines.mk.input.diff?cvsroot=cluster&r1=1.3&r2=1.4

--- cluster/cman/make/defines.mk.input	2006/08/02 15:09:46	1.4
+++ cluster/cman/make/defines.mk.input	2006/08/04 16:54:01	1.5
@@ -11,19 +11,12 @@
 ###############################################################################
 ###############################################################################
 
-ARCH=$(shell uname -p)
-
 #Install Locations
 sbindir ?= ${DESTDIR}/@SBINDIR@
 mandir ?= ${DESTDIR}/@MANDIR@
-ifeq (,$(findstring 64,$(ARCH)))
 libdir ?= ${DESTDIR}/@LIBDIR@
-ccslibdir ?= ${DESTDIR}/@CCSLIBDIR@
-else
-libdir ?= ${DESTDIR}/@LIBDIR at 64
-ccslibdir ?= ${DESTDIR}/@CCSLIBDIR at 64
-endif
 libexecdir ?= ${DESTDIR}/@LIBEXECDIR@
+ccslibdir ?= ${DESTDIR}/@CCSLIBDIR@
 incdir ?= ${DESTDIR}/@INCDIR@
 ccsincdir ?= ${DESTDIR}/@CCSINCDIR@
 
--- cluster/group/make/defines.mk.input	2006/07/28 21:32:29	1.3
+++ cluster/group/make/defines.mk.input	2006/08/04 16:54:01	1.4
@@ -12,15 +12,9 @@
 ###############################################################################
 
 #Install Locations
-ARCH=$(shell uname -p)
-
 sbindir ?= ${DESTDIR}/@SBINDIR@
 mandir ?= ${DESTDIR}/@MANDIR@
-ifeq (,$(findstring 64,$(ARCH)))
 libdir ?= ${DESTDIR}/@LIBDIR@
-else
-libdir ?= ${DESTDIR}/@LIBDIR at 64
-endif
 iddevlibdir ?= ${DESTDIR}/@IDDEVLIBDIR@
 cmanlibdir ?= ${DESTDIR}/@CMANLIBDIR@
 incdir ?= ${DESTDIR}/@INCDIR@