summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfourdan2006-05-31 13:05:20 +0000
committerfourdan2006-05-31 13:05:20 +0000
commit9ac55df54fbcf5b17f53e38a18d538e9af074488 (patch)
tree6dcbe660dc1a0661f57856ee407d2e841ff2d4a6
parent9d0fe9414f3e38e9439c5ce8a72a3dff1a984314 (diff)
downloadivy-cplusplus-9ac55df54fbcf5b17f53e38a18d538e9af074488.zip
ivy-cplusplus-9ac55df54fbcf5b17f53e38a18d538e9af074488.tar.gz
ivy-cplusplus-9ac55df54fbcf5b17f53e38a18d538e9af074488.tar.bz2
ivy-cplusplus-9ac55df54fbcf5b17f53e38a18d538e9af074488.tar.xz
Fix for 64bits Mandriva (bis)
-rw-r--r--Makefile10
1 files changed, 2 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 118ace9..2316a01 100644
--- a/Makefile
+++ b/Makefile
@@ -44,14 +44,8 @@ LIBIVY_DEPLIBS = -livy
LIBIVY_GLFW_SHARED = $(LIBIVY_GLFW)$(DSO_EXT)
LIBIVY_GLFW_DEPLIBS = -lglfw -livy -lX11 -lXext -lXxf86vm -lGL -lpthread
-PERHAPS64= `uname -m | perl -ne "print /64/ ? '64' : '';"`
-
-ifeq ($(PERHAPS64), '64')
- LIB=lib64
-else
- LIB=lib
-endif
-
+PERHAPS64 := $(shell uname --machine | perl -ne "print /64/ ? '64' : '';")
+LIB:= lib$(PERHAPS64)
XTLIB = -L/usr/X11R6/$(LIB)/
#a mettre dans les makefiles generant les executables