--- ./make/commonivdefs.orig	Tue Aug 22 18:55:37 2000
+++ ./make/commonivdefs	Tue Aug 22 19:01:12 2000
@@ -17,9 +17,14 @@
 ifeq ($(OSTYPE),Linux)
   usingLinux = 1
 else
+ifeq ($(OSTYPE),linux-gnu)
+  usingLinux = 1
+else
   usingLinux = 0
 endif
 endif
+endif
+
 ifeq ($(usingLinux),1)
 	CXXFLAGS+=-D_POSIX_SOURCE -D_XOPEN_SOURCE -fPIC -pedantic \
 	-I/usr/include -I/usr/X11R6/include
@@ -87,7 +92,7 @@
 LD_QUICKSTART_INFO=
 
 LDIRT += ii_files $(OBJECT_PATH) $(MAN1_COMPRESSED) $(MAN3_COMPRESSED) \
-    	 $(MAN3_INDEX) $(MAN4_COMPRESSED) $(DOCTOR_HTML_TARGETS) \
+	 $(MAN3_INDEX) $(MAN4_COMPRESSED) $(DOCTOR_HTML_TARGETS) \
 	 $(DOCTOR_INHERIT_TARGETS)
 
 LCINCS += -I$(DEPTH)/include
@@ -162,7 +167,7 @@
             endif
         endif
     else
-    	OLD_OBJECT_FORMAT = 1
+        OLD_OBJECT_FORMAT = 1
         LC++OPTS += -woff 3247,3672 -fullwarn $(LC++OPTS_32)
         INST_DL_PATH = $(INST_DL_ROOT)/lib$(DL_PATH_SUF)
         INST_DL_TAG = $(INST_TAG_PRE)DL$(INST_TAG_SUF)
@@ -178,7 +183,7 @@
 ifeq ($(usingLinux),1)
     LC++OPTS += -Wunused -Wformat
     ifeq (,$(findstring debug,$(LIBTYPE)))
-    	LC++OPTS += -Wuninitialized
+        LC++OPTS += -Wuninitialized
     endif
     INST_DL_PATH = $(INST_DL_ROOT)/lib$(DL_PATH_SUF)
     INST_DL_TAG = $(INST_TAG_PRE)DL$(INST_TAG_SUF)
@@ -293,7 +298,7 @@
     INSTALL = $(PERL) $(IVDEPTH)/make/install_$(THISPLATFORM).pl
 endif
     ifdef IRIX
-    	GENEXPORTS = $(TOOLROOT)/usr/lib/ags/tools/genexports_irix.pl
+        GENEXPORTS = $(TOOLROOT)/usr/lib/ags/tools/genexports_irix.pl
     endif
     LIBPATHOPT = -L
     LIBPREFIX = lib