diff --git a/cde/programs/dtaction/Imakefile b/cde/programs/dtaction/Imakefile
index 50aaf51fe..429e4d1af 100644
--- a/cde/programs/dtaction/Imakefile
+++ b/cde/programs/dtaction/Imakefile
@@ -14,7 +14,7 @@ EXTRA_DEFINES = +e
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dtcalc/Imakefile b/cde/programs/dtcalc/Imakefile
index 17823c266..955a34e95 100644
--- a/cde/programs/dtcalc/Imakefile
+++ b/cde/programs/dtcalc/Imakefile
@@ -33,7 +33,7 @@ SYS_LIBRARIES = -lm -lgen
 
 XCOMM On Linux once you link against a C++ library the whole program 
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dtdbcache/Imakefile b/cde/programs/dtdbcache/Imakefile
index 067b0c972..c13c72869 100644
--- a/cde/programs/dtdbcache/Imakefile
+++ b/cde/programs/dtdbcache/Imakefile
@@ -60,7 +60,7 @@ SYS_LIBRARIES = -lm -lgen
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dtdocbook/instant/Imakefile b/cde/programs/dtdocbook/instant/Imakefile
index fdf05f81e..4866c21ab 100644
--- a/cde/programs/dtdocbook/instant/Imakefile
+++ b/cde/programs/dtdocbook/instant/Imakefile
@@ -14,7 +14,7 @@ EXTRA_LIBRARIES = -lm
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dtdocbook/xlate_locale/Imakefile b/cde/programs/dtdocbook/xlate_locale/Imakefile
index eb349ee74..5d15d2b36 100644
--- a/cde/programs/dtdocbook/xlate_locale/Imakefile
+++ b/cde/programs/dtdocbook/xlate_locale/Imakefile
@@ -15,7 +15,7 @@ SYS_LIBRARIES = -lgen
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dtexec/Imakefile b/cde/programs/dtexec/Imakefile
index 5cffc3dc3..d527c6fd2 100644
--- a/cde/programs/dtexec/Imakefile
+++ b/cde/programs/dtexec/Imakefile
@@ -7,7 +7,7 @@ INCLUDES = -I.
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dtfile/Imakefile b/cde/programs/dtfile/Imakefile
index 19a5063b4..420e7cb07 100644
--- a/cde/programs/dtfile/Imakefile
+++ b/cde/programs/dtfile/Imakefile
@@ -29,7 +29,7 @@ EXTRA_CCOPTIONS = -xF
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 EXTRA_DEFINES = -I/usr/include/freetype2
 #endif
diff --git a/cde/programs/dtfile/dtcopy/Imakefile b/cde/programs/dtfile/dtcopy/Imakefile
index 6da100b9f..edb07096e 100644
--- a/cde/programs/dtfile/dtcopy/Imakefile
+++ b/cde/programs/dtfile/dtcopy/Imakefile
@@ -12,7 +12,7 @@ EXTRA_CCOPTIONS = -xF
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dthelp/dthelpdemo/Imakefile b/cde/programs/dthelp/dthelpdemo/Imakefile
index 8c6b85aca..4ababeb02 100644
--- a/cde/programs/dthelp/dthelpdemo/Imakefile
+++ b/cde/programs/dthelp/dthelpdemo/Imakefile
@@ -19,7 +19,7 @@ SYS_LIBRARIES = DtClientSysLibs $(CXXLIB)
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dthelp/dthelpgen/Imakefile b/cde/programs/dthelp/dthelpgen/Imakefile
index 9bb1ca428..ad23dc894 100644
--- a/cde/programs/dthelp/dthelpgen/Imakefile
+++ b/cde/programs/dthelp/dthelpgen/Imakefile
@@ -13,7 +13,7 @@ EXTRA_INCLUDES = -I$(DTHELPSRC)
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dthelp/dthelpprint/Imakefile b/cde/programs/dthelp/dthelpprint/Imakefile
index a81a54506..160a6a8e3 100644
--- a/cde/programs/dthelp/dthelpprint/Imakefile
+++ b/cde/programs/dthelp/dthelpprint/Imakefile
@@ -18,7 +18,7 @@ SYS_LIBRARIES = DtClientSysLibs $(CXXLIB)
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dthelp/dthelpview/Imakefile b/cde/programs/dthelp/dthelpview/Imakefile
index df38f4ed8..d02b80cac 100644
--- a/cde/programs/dthelp/dthelpview/Imakefile
+++ b/cde/programs/dthelp/dthelpview/Imakefile
@@ -3,7 +3,7 @@ PROGRAMS = dthelpview
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dticon/Imakefile b/cde/programs/dticon/Imakefile
index 898a1357f..8f34bb14e 100644
--- a/cde/programs/dticon/Imakefile
+++ b/cde/programs/dticon/Imakefile
@@ -55,7 +55,7 @@ EXTRA_DEFINES =
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dtimsstart/Imakefile b/cde/programs/dtimsstart/Imakefile
index 6f957ff55..5e1ecf3f9 100644
--- a/cde/programs/dtimsstart/Imakefile
+++ b/cde/programs/dtimsstart/Imakefile
@@ -27,7 +27,7 @@ EXTRA_DEFINES = -DANSICPP
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dtpdm/Imakefile b/cde/programs/dtpdm/Imakefile
index 6dacbe91b..601ac9955 100644
--- a/cde/programs/dtpdm/Imakefile
+++ b/cde/programs/dtpdm/Imakefile
@@ -31,7 +31,7 @@ SYS_LIBRARIES = -lintl -L/opt/SUNWspro/SC2.0.1 -lm -lgen -ldl -lC
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dtscreen/Imakefile b/cde/programs/dtscreen/Imakefile
index b011791d7..b1d4ef85d 100644
--- a/cde/programs/dtscreen/Imakefile
+++ b/cde/programs/dtscreen/Imakefile
@@ -13,7 +13,7 @@ LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
 
 XCOMM On Linux once you link against a C++ library the whole program 
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dtsearchpath/libCliSrv/Imakefile b/cde/programs/dtsearchpath/libCliSrv/Imakefile
index 89d9e180b..637c0c57a 100644
--- a/cde/programs/dtsearchpath/libCliSrv/Imakefile
+++ b/cde/programs/dtsearchpath/libCliSrv/Imakefile
@@ -22,7 +22,7 @@ EXTRA_DEFINES = -DIOSTREAMSWORKS
 EXTRA_DEFINES = -DIOSTREAMSWORKS
 #endif
 
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CXXEXTRA_DEFINES = -fpermissive
 #endif
 
diff --git a/cde/programs/dtsession/Imakefile b/cde/programs/dtsession/Imakefile
index f6bc68ff4..d0eb76e26 100644
--- a/cde/programs/dtsession/Imakefile
+++ b/cde/programs/dtsession/Imakefile
@@ -69,7 +69,7 @@ SYS_LIBRARIES = -lelf -lm -ldl -lgen
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dtspcd/Imakefile b/cde/programs/dtspcd/Imakefile
index 04a5590af..142ce57ce 100644
--- a/cde/programs/dtspcd/Imakefile
+++ b/cde/programs/dtspcd/Imakefile
@@ -32,7 +32,7 @@ SYS_LIBRARIES = -lm
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dtstyle/Imakefile b/cde/programs/dtstyle/Imakefile
index 3b10e958c..82fb2c572 100644
--- a/cde/programs/dtstyle/Imakefile
+++ b/cde/programs/dtstyle/Imakefile
@@ -21,7 +21,7 @@ EXTRA_DEFINES = -D$(PROGRAMS)
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dtterm/Imakefile b/cde/programs/dtterm/Imakefile
index 2cb6e6eff..d7cb6c643 100644
--- a/cde/programs/dtterm/Imakefile
+++ b/cde/programs/dtterm/Imakefile
@@ -31,7 +31,7 @@ USE_XHPLIB = $(XHPLIB)
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif
 
diff --git a/cde/programs/dtudcexch/Imakefile b/cde/programs/dtudcexch/Imakefile
index 72b2577f3..a65ac3c1b 100644
--- a/cde/programs/dtudcexch/Imakefile
+++ b/cde/programs/dtudcexch/Imakefile
@@ -30,7 +30,7 @@ UDC_INC_PATH7     =  -I$(FONTEDT_PATH1)/dtgpftobdf
 
 XCOMM On Linux once you link against a C++ library the whole program
 XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
+#if defined(LinuxArchitecture)
 CCLINK = $(CXX)
 #endif