diff -urN -x '*CVS*' -x '*~' ../SRC680_m155/solenv/inc/dmakeextraimport.lst solenv/inc/dmakeextraimport.lst
--- ../SRC680_m155/solenv/inc/dmakeextraimport.lst	1969-12-31 19:00:00.000000000 -0500
+++ solenv/inc/dmakeextraimport.lst	2006-02-04 13:23:14.521125000 -0500
@@ -0,0 +1,4 @@
+# File with extra (i.e. not from setsolar.pl/set_soenv) environment
+# variables that shall be imported as macros by dmake
+SOMETHING
+THIS THAT # comments are allowed!
diff -urN -x '*CVS*' -x '*~' ../SRC680_m155/solenv/inc/dmakenoimport.lst solenv/inc/dmakenoimport.lst
--- ../SRC680_m155/solenv/inc/dmakenoimport.lst	1969-12-31 19:00:00.000000000 -0500
+++ solenv/inc/dmakenoimport.lst	2006-02-04 14:33:14.474250000 -0500
@@ -0,0 +1,3 @@
+# File with environment variable names that shall *not* be imported
+# as macros by dmake even though they are set by setsolar.pl/set_soenv.
+SOLARVERSION INPATH # These are always imported by startup.mk, no need to include them
diff -urN -x '*CVS*' -x '*~' ../SRC680_m155/solenv/inc/startup/startup.mk solenv/inc/startup/startup.mk
--- ../SRC680_m155/solenv/inc/startup/startup.mk	2005-04-11 04:59:12.000000000 -0400
+++ solenv/inc/startup/startup.mk	2006-02-04 14:35:10.349250000 -0500
@@ -20,7 +20,9 @@
 # Define the directory separator string.
 / *=  $(DIRSEPSTR)
 
-.IMPORT .IGNORE : .EVERYTHING
+#.IMPORT .IGNORE : .EVERYTHING
+.IMPORT : SOLARVERSION INPATH
+.INCLUDE .NOINFER: "$(SOLARVERSION)$(DIRSEPSTR)$(INPATH)$(DIRSEPSTR)inc$(DIRSEPSTR)importenv.mk"
 
 .IF "$(TNR)" == ""
 
Files ../SRC680_m155/solenv/wntmsci10/bin/dmake.exe and solenv/wntmsci10/bin/dmake.exe differ