All of lore.kernel.org
 help / color / mirror / Atom feed
From: rpeterso@sourceware.org <rpeterso@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] cluster/cman/make defines.mk.input
Date: 2 Aug 2006 15:09:47 -0000	[thread overview]
Message-ID: <20060802150947.16571.qmail@sourceware.org> (raw)

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@
 



                 reply	other threads:[~2006-08-02 15:09 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060802150947.16571.qmail@sourceware.org \
    --to=rpeterso@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.