summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2002-07-30 12:12:20 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2002-07-30 12:12:20 +0000
commit3507110b9e2f60e615983a93003dc0cc4e140808 (patch)
tree1eee60426a9500f749dade4eac378c20c503daea /tools
parentafa9a37e1b987e27c20bc38fd80082a6c7172b7c (diff)
downloaddrakx-backup-do-not-use-3507110b9e2f60e615983a93003dc0cc4e140808.tar
drakx-backup-do-not-use-3507110b9e2f60e615983a93003dc0cc4e140808.tar.gz
drakx-backup-do-not-use-3507110b9e2f60e615983a93003dc0cc4e140808.tar.bz2
drakx-backup-do-not-use-3507110b9e2f60e615983a93003dc0cc4e140808.tar.xz
drakx-backup-do-not-use-3507110b9e2f60e615983a93003dc0cc4e140808.zip
lib64 fixes
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile9
-rw-r--r--tools/aewm-drakx/Makefile9
2 files changed, 16 insertions, 2 deletions
diff --git a/tools/Makefile b/tools/Makefile
index f689235a1..e632cc1e3 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -5,6 +5,13 @@ DIRS = ddcprobe serial_probe aewm-drakx
BASE = $(ROOTDEST)/Mandrake/base
CFLAGS = -Wall
+ARCH := $(shell arch | egrep "(x86_64|sparc64|s390x)")
+ifneq ("x$(ARCH)", "x")
+LIB_NAME = lib64
+else
+LIB_NAME = lib
+endif
+
.PHONY: clean install $(DIRS)
all: $(DIRS) xhost+ rpcinfo-flushed install
@@ -22,7 +29,7 @@ install:
@mkdir -p $(DEST)/usr/bin
xhost+: %: %.c
- $(CC) $(CFLAGS) $< -L/usr/X11R6/lib -lX11 -o $@
+ $(CC) $(CFLAGS) $< -L/usr/X11R6/$(LIB_NAME) -lX11 -o $@
ddcprobe/ddcxinfos:
$(MAKE) -C ddcprobe ddcxinfos
diff --git a/tools/aewm-drakx/Makefile b/tools/aewm-drakx/Makefile
index ed1b95ecf..ec5bbf977 100644
--- a/tools/aewm-drakx/Makefile
+++ b/tools/aewm-drakx/Makefile
@@ -1,5 +1,12 @@
+ARCH := $(shell arch | egrep "(x86_64|sparc64|s390x)")
+ifneq ("x$(ARCH)", "x")
+LIB_NAME = lib64
+else
+LIB_NAME = lib
+endif
+
CFLAGS = -Wall -Os
-LDFLAGS = -L/usr/X11R6/lib -lX11
+LDFLAGS = -L/usr/X11R6/$(LIB_NAME) -lX11
CFILES = $(wildcard *.c)
OFILES = $(CFILES:%.c=%.o)
GOAL = aewm-drakx