$OpenBSD: patch-Makefile,v 1.3 2010/09/08 20:32:18 landry Exp $
--- Makefile.orig	Sat Jun 12 16:11:24 2010
+++ Makefile	Tue Jun 15 21:52:31 2010
@@ -1,5 +1,5 @@
 # Where is your Xwindows located?
-X11=/usr/X11R6
+#X11=/usr/X11R6
 
 #
 # For building rpms
@@ -18,8 +18,8 @@ libprefix=/lib
 RPMDIR=/usr/src/RPM
 
 # Choose compiler
-CC=gcc
-LD=gcc
+#CC=gcc
+#LD=gcc
 BINFORMAT=bin
 
 #Debug or not debug build
@@ -77,7 +77,7 @@ freebsd:
 	${MAKE} all CC=gcc XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared X11=/usr/X11R6/
 
 openbsd:
-	${MAKE} all CC=gcc XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared X11=/usr/X11R6/
+	${MAKE} all XCFLAGS=-fPIC LD=${CC} XLDFLAGS=-shared X11=${X11BASE}
 
 auto:
 	@case "x`uname`" in \
@@ -123,7 +123,7 @@ BIN_FILES=mozplugger.so \
 DEFINES= -DXP_UNIX -DVERSION=\"$(VERSION)\" -D$(BUILD) #-D__amd64__
 INCLUDES= -Inpapi/include -I$(X11)/include
 RPM_OPT_FLAGS ?= -O2
-COMMON_CFLAGS=$(RPM_OPT_FLAGS) $(INCLUDES) $(DEFINES)
+COMMON_CFLAGS=$(INCLUDES) $(DEFINES)
 COMMON_LDFLAGS=
 
 NORM_LDFLAGS=
@@ -134,8 +134,8 @@ XLIBS=-lX11 -L$(XLIBDIR)
 EXTRA_LIBS=
 
 LDSHARED=$(LD) $(XLDFLAGS)
-LDFLAGS=$(COMMON_LDFLAGS) $(NORM_LDFLAGS)
-CFLAGS=$(COMMON_CFLAGS) $(XCFLAGS)
+LDFLAGS+=$(COMMON_LDFLAGS) $(NORM_LDFLAGS)
+CFLAGS+=$(COMMON_CFLAGS) $(XCFLAGS)
 
 all: mozplugger.so mozplugger-helper mozplugger-controller mozplugger-linker
 
