$OpenBSD$
--- config/Linux_All.mk.orig	Tue May 10 21:53:44 2005
+++ config/Linux_All.mk	Sun Sep 24 14:14:24 2006
@@ -41,18 +41,20 @@
 # Config for all versions of Linux
 #
 
-CC = gcc
-CCC = g++
+#CC = gcc
+#CCC = g++
 CFLAGS +=  -Wall -Wno-format
 OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
 
+SO_SUFFIX = so.1
+
 RANLIB = echo
 MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS)
 
 #.c.o:
 #      $(CC) -c -MD $*.d $(CFLAGS) $<
 
-CPU_ARCH = $(shell uname -m)
+CPU_ARCH = $(shell arch -s)
 # don't filter in x86-64 architecture
 ifneq (x86_64,$(CPU_ARCH))
 ifeq (86,$(findstring 86,$(CPU_ARCH)))
@@ -93,6 +95,10 @@ JS_EDITLINE = 1
 ifeq ($(CPU_ARCH),x86_64)
 # Use VA_COPY() standard macro on x86-64
 # FIXME: better use it everywhere
+OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
+endif
+
+ifeq ($(CPU_ARCH),powerpc)
 OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
 endif
 
