diff options
| author | Peter Osterlund <petero2@telia.com> | 2004-07-31 03:20:43 +0200 |
|---|---|---|
| committer | Peter Osterlund <petero2@telia.com> | 2006-04-09 04:02:45 +0200 |
| commit | a28d58fc6886b72773b5aaeec3d18bef662734b5 (patch) | |
| tree | 8516f9a2374f948e94adbcd02d61dc267d2c2c21 /Makefile | |
| parent | f4bebd6775807f6b3a309372c218eb5a0696bbbc (diff) | |
Makefile fix for x86_64 systems. Some setups required LIBDIR
to be set to lib64. Since this is OK for all x86_64 systems, always use
LIBDIR=lib64 for x86_64 systems.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -7,7 +7,6 @@ INSTALLED_X = $(DESTDIR)/usr/X11R6 LOCAL_X = Xincludes/usr/X11R6 BINDIR = $(DESTDIR)/usr/local/bin MANDIR = $(DESTDIR)/usr/local/man/man1 -LIBDIR = lib ifeq ($(TOP),) # This hack attempts to check if the needed XFree86 header files are installed. @@ -38,15 +37,15 @@ endif MODULE_DEFINES = -DIN_MODULE -DXFree86Module PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO -ARCH_DEFINES_32 = -D__i386__ -ARCH_DEFINES_64 = -D__x86_64__ -D_XSERVER64 +ARCH = $(shell /bin/arch) -ARCH_DEFINES := $(shell \ - if [ "$(shell /bin/arch)"x == "x86_64x" ] ; then \ - echo -n $(ARCH_DEFINES_64) ; \ - else \ - echo -n $(ARCH_DEFINES_32) ; \ - fi ) +ifeq ($(ARCH),x86_64) + ARCH_DEFINES = -D__x86_64__ -D_XSERVER64 + LIBDIR = lib64 +else + ARCH_DEFINES = -D__i386__ + LIBDIR = lib +endif STD_DEFINES = -Dlinux -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP -DXCSECURITY -DTOGCUP -DDPMSExtension -DPIXPRIV -DPANORAMIX -DRENDER -DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH -DXFreeXDGA -DXvExtension -DXFree86LOADER -DXFree86Server -DXF86VIDMODE -DSMART_SCHEDULE -DBUILDDEBUG -DX_BYTE_ORDER=X_LITTLE_ENDIAN -DNDEBUG $(ARCH_DEFINES) ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(MODULE_DEFINES) |