summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPeter Osterlund <petero2@telia.com>2002-07-04 00:45:56 +0200
committerPeter Osterlund <petero2@telia.com>2006-04-09 04:00:49 +0200
commit6a78abbeefc058857c4a503a47ca68ebcc51bbf7 (patch)
tree251d2da909832b7bf9e29f912abb1e5392a6221c /Makefile
parent0d8042d8b68e259457de14a0c4365459b1de7d30 (diff)
Modifications to make builds on rh73 work. Note that an X
source tree is required in /usr/src/redhat/BUILD/XFree86-4.2.0/xc.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 33cab24..7da1c27 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-TOP = /usr/src/packages/BUILD/xc
+TOP = /usr/src/redhat/BUILD/XFree86-4.2.0/xc
XTOP = $(TOP)
BUILDINCROOT = $(TOP)/exports
EXTINCSRC = $(XTOP)/include/extensions
@@ -29,7 +29,7 @@ CDEBUGFLAGS = -O2
CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES)
CC = gcc
-CCOPTIONS = -ansi -pedantic -Wall -Wpointer-arith
+CCOPTIONS = -ansi -pedantic -Wall -Wpointer-arith -fno-merge-constants
LDCOMBINEFLAGS = -r