[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] cluster/cman/make defines.mk.input



CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rpeterso 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 64
+ccslibdir ?= ${DESTDIR}/@CCSLIBDIR 64
+endif
+libexecdir ?= ${DESTDIR}/@LIBEXECDIR@
 incdir ?= ${DESTDIR}/@INCDIR@
 ccsincdir ?= ${DESTDIR}/@CCSINCDIR@
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]