add: OS_VERSION to differ the Unix's

3 files changed, 21 insertions, 10 deletions

diff --git a/dmake/Makefile.am b/dmake/Makefile.am
index 8716d13afbee..b7dce4b48374 100755
--- a/dmake/Makefile.am
+++ b/dmake/Makefile.am
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: Makefile.am,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: mh $ $Date: 2001-05-04 10:47:49 $
+#   last change: $Author: mh $ $Date: 2001-06-13 13:34:05 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -79,6 +79,6 @@ EXTRA_DIST = make.c
 bin_PROGRAMS = dmake
 
 # set the include path found by configure
-INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/unix/linux -I$(top_srcdir)/unix -I$(top_srcdir)/unix/linux/gnu 
+INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/unix/@OS_VERSION@ -I$(top_srcdir)/unix -I$(top_srcdir)/unix/@OS_VERSION@/gnu 
 
                                                                                 
diff --git a/dmake/configure.in b/dmake/configure.in
index 4644b77182ff..875bdd21ad65 100755
--- a/dmake/configure.in
+++ b/dmake/configure.in
@@ -28,6 +28,7 @@ dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/file.h sys/time.h unistd.h)
+AC_CONFIG_HEADERS(config.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -42,8 +43,20 @@ AC_FUNC_UTIME_NULL
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(getcwd getwd putenv strcspn strerror strspn strstr)
 
+dnl Checks for OS
+OS_UNAME=`uname`
+if test ${OS_UNAME} = SunOS; then
+	echo "Solaris found"
+	OS_VERSION=solaris
+fi
+if test ${OS_UNAME} = Linux; then
+	echo "Linux found"
+	OS_VERSION=linux
+fi
+AC_SUBST(OS_VERSION)
+
 AC_OUTPUT(Makefile unix/Makefile startup/Makefile startup/unix/Makefile \
-		startup/unix/linux/Makefile dmakeroot.h )
+		startup/unix/linux/Makefile startup/unix/solaris/Makefile dmakeroot.h )
 #AC_OUTPUT(unix/bsd43/Makefile Makefile makefile unix/solaris/Makefile dbug/malloc/makefile unix/Makefile)
 
 dnl ******************************
@@ -52,6 +65,7 @@ dnl ******************************
 
 AC_OUTPUT_COMMANDS([
 
+
 ## Generate `dmakeroot.h' in two cases
 ## 1. `config.status' is run either explicitly, or via configure.
 ##     Esp. not when it is run in `Makefile' to generate makefiles and
@@ -85,6 +99,8 @@ if cmp -s $outfile dmakeroot.h; then
 else
     mv $outfile dmakeroot.h
 fi 
+],[
+OS_VERSION=$OS_VERSION
 ])
 							  
 				   
diff --git a/dmake/unix/Makefile.am b/dmake/unix/Makefile.am
index 358b4740ce4c..01d494d2155f 100755
--- a/dmake/unix/Makefile.am
+++ b/dmake/unix/Makefile.am
@@ -4,13 +4,8 @@ noinst_LIBRARIES = libunix.a
 libunix_a_SOURCES = arlib.c dcache.c dirbrk.c rmprq.c ruletab.c runargv.c
 
 
-INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/unix/linux/gnu -I$(top_srcdir)/unix  -I$(top_srcdir)/unix/linux
+INCLUDES = -I$(top_srcdir) -I$(top_builddir)  -I$(top_srcdir)/unix/@OS_VERSION@/gnu -I$(top_srcdir)/unix/@OS_VERSION@ -I$(top_srcdir)/unix  
 
-#LDADDS = @STRIP_BEGIN@  \
-#        -lm             \
-#	@STRIP_END@
-
-#libunix_a_LDFLAGS =   -export-dynamic