diff options
| author | Peter Osterlund <petero2@telia.com> | 2004-12-11 16:54:34 +0100 |
|---|---|---|
| committer | Peter Osterlund <petero2@telia.com> | 2006-04-09 04:02:57 +0200 |
| commit | 9bbdcabf8849faa581461191bd10dbf12be3d28b (patch) | |
| tree | e187f51f16134fc568d84a28a708ad6f9fc22851 | |
| parent | 2732d1ad9fb59937f14d5ec7d0a3f01a9444c843 (diff) | |
The fix in change 2732d1ad9fb59937f14d5ec7d0a3f01a9444c843 was not
complete.
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | synaptics.spec | 2 |
2 files changed, 4 insertions, 3 deletions
@@ -8,6 +8,9 @@ LOCAL_X = Xincludes/usr/X11R6 BINDIR = $(DESTDIR)/usr/local/bin MANDIR = $(DESTDIR)/usr/local/man/man1 +ifeq ($(ARCH),) + ARCH = $(shell /bin/arch) +endif ifeq ($(ARCH),x86_64) ARCH_DEFINES = -D__x86_64__ -D_XSERVER64 LIBDIR = lib64 @@ -45,8 +48,6 @@ endif MODULE_DEFINES = -DIN_MODULE -DXFree86Module PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO -ARCH = $(shell /bin/arch) - 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) diff --git a/synaptics.spec b/synaptics.spec index 87224b3..a6922bc 100644 --- a/synaptics.spec +++ b/synaptics.spec @@ -20,7 +20,7 @@ advanced features of the touchpad becomes available. %setup %build -make +make ARCH=%{_arch} %clean rm -rf $RPM_BUILD_ROOT |