--- ./make/commondefs.orig	Tue Aug 22 10:31:00 2000
+++ ./make/commondefs	Tue Aug 22 18:06:52 2000
@@ -45,16 +45,23 @@
 AR	= $(TOOLROOT)/usr/bin/ar
 AS	= $(TOOLROOT)/usr/bin/as $(ENDIAN)
 BISON   = $(TOOLROOT)/usr/bin/bison
+
 # ugly thing to check for linux or Linux ...
+
 ifeq ($(OSTYPE),linux)
   usingLinux = 1
 else
-ifeq ($(OSTYPE),Linux)
-  usingLinux = 1
-else
-  usingLinux = 0
-endif
+  ifeq ($(OSTYPE),linux-gnu)
+    usingLinux = 1
+  else
+    ifeq ($(OSTYPE),Linux)
+      usingLinux = 1
+    else
+      usingLinux = 0
+    endif
+  endif
 endif
+
 ifeq ($(usingLinux),1)
 	C++	= $(TOOLROOT)/usr/bin/g++
 	C++C	= $(TOOLROOT)/usr/bin/g++
@@ -172,8 +179,9 @@
 OPTIMIZER  = -O
 ifeq ($(usingLinux),1)
 MKDEPOPT   = -MD
+OSDEFS     = -D_POSIX_SOURCE -D_XOPEN_SOURCE
 endif
-COMMONGOPTS=$(OPTIMIZER) $(MKDEPOPT) $(ENDIAN)
+COMMONGOPTS= $(OPTIMIZER) $(MKDEPOPT) $(ENDIAN) $(OSDEFS)
 
 #
 # Pick appropriate STYLE - releasedefs defines the default
@@ -205,7 +213,7 @@
 endif
 endif
 
-GCOPTS	= $(CSTYLE) $(OPTIMIZER) $(ENDIAN) $(MKDEPOPT) $(WOFF)
+GCOPTS	= $(CSTYLE) $(COMMONGOPTS) $(WOFF)
 GCDEFS	=
 GCINCS	= 
 
@@ -264,7 +272,7 @@
 C++DEFS   = $(VC++DEFS) $(LC++DEFS) $(GC++DEFS)
 C++INCS   = $(VC++INCS) $(LC++INCS) $(GC++INCS)
 
-GC++OPTS  = $(CSTYLE) $(OPTIMIZER) $(ENDIAN) $(MKDEPOPT)
+GC++OPTS  = $(CSTYLE) $(COMMONGOPTS)
 GC++INCS  = 
 GC++DEFS  =