s,/usr/dt,CDE_INSTALLATION_TOP,g in dtlogin/config

diff --git a/cde/programs/dtlogin/config/0015.sun.env.src b/cde/programs/dtlogin/config/0015.sun.env.src
index f9af9faeb29fec4d0155a88cdf2b7ff7a6e447b8..d57d6dc30169178a4b0b28877896ccd13c19aa75 100644 (file)
--- a/cde/programs/dtlogin/config/0015.sun.env.src
+++ b/cde/programs/dtlogin/config/0015.sun.env.src
@@ -60,9 +60,9 @@ XCOMM ##########################################################################
   HASH
   if [ -z "$AB_CARDCATALOG" ]
   then
-      export AB_CARDCATALOG=/usr/dt/share/answerbooks/$LANG/ab_cardcatalog
+      export AB_CARDCATALOG=CDE_INSTALLATION_TOP/share/answerbooks/$LANG/ab_cardcatalog
   else
-      export AB_CARDCATALOG=/usr/dt/share/answerbooks/$LANG/ab_cardcatalog:$AB_CARDCATALOG
+      export AB_CARDCATALOG=CDE_INSTALLATION_TOP/share/answerbooks/$LANG/ab_cardcatalog:$AB_CARDCATALOG
   fi
 
   HASH

diff --git a/cde/programs/dtlogin/config/Xconfig.src b/cde/programs/dtlogin/config/Xconfig.src
index 16cbe4b014606472df90cae81a39f289024f2dd5..57f0ec9f3fe2c02ed5f443b2708daa5e604812fe 100644 (file)
--- a/cde/programs/dtlogin/config/Xconfig.src
+++ b/cde/programs/dtlogin/config/Xconfig.src
@@ -136,9 +136,9 @@ XCOMM
 XCOMM  Dtlogin*userPath:          <path>
 
 #if defined(linux)
-Dtlogin*userPath:          /bin:/usr/bin:/sbin:/usr/sbin:/usr/dt/bin
+Dtlogin*userPath:          /bin:/usr/bin:/sbin:/usr/sbin:CDE_INSTALLATION_TOP/bin
 #elif defined(CSRG_BASED)
-Dtlogin*userPath:          /bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/dt/bin
+Dtlogin*userPath:          /bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:CDE_INSTALLATION_TOP/bin
 #endif
 
 

diff --git a/cde/programs/dtlogin/config/Xresources.ow.src b/cde/programs/dtlogin/config/Xresources.ow.src
index 86ac7aeed8a8f780357e86da9d4098a39241b68b..42f1d27b46362f45e66132b57214d6e445709942 100644 (file)
--- a/cde/programs/dtlogin/config/Xresources.ow.src
+++ b/cde/programs/dtlogin/config/Xresources.ow.src
@@ -18,5 +18,5 @@ Dtlogin*altDtsIncrement:      True
 
 Dtlogin*altDtName:     %|nls-291-#OpenWindows#|
 Dtlogin*altDtKey:      /usr/openwin/bin/olwm
-Dtlogin*altDtStart:    /usr/dt/config/Xsession.ow
+Dtlogin*altDtStart:    CDE_INSTALLATION_TOP/config/Xsession.ow
 Dtlogin*altDtLogo:     OWlogo

diff --git a/cde/programs/dtlogin/config/Xresources.src b/cde/programs/dtlogin/config/Xresources.src
index 9930c982d08379d40d0d3a537053dc7bb4ba781f..65cd5583eb010beeaa0fe63c8cc70e02afe914cb 100644 (file)
--- a/cde/programs/dtlogin/config/Xresources.src
+++ b/cde/programs/dtlogin/config/Xresources.src
@@ -185,7 +185,7 @@ Dtlogin*preeditType:
 !!  languages available on the login screen. The Dtlogin*languageList
 !!  resource takes precidence over this resource.
 !!
-Dtlogin*languageListCmd: /usr/dt/bin/dtlslocale
+Dtlogin*languageListCmd: CDE_INSTALLATION_TOP/bin/dtlslocale
 
 #undef C
 XCOMM undef C

diff --git a/cde/programs/dtlogin/config/Xsession.ow.src b/cde/programs/dtlogin/config/Xsession.ow.src
index 9d277c7b6ff2c37cc2e1ac8771cad918d1d442dc..5dba57a31df11bb3b8cd40ff53eb9b1b5e9081a7 100644 (file)
--- a/cde/programs/dtlogin/config/Xsession.ow.src
+++ b/cde/programs/dtlogin/config/Xsession.ow.src
@@ -16,7 +16,7 @@ XCOMM ##
 XCOMM ####################################################################
 
 
-DTDSPMSG=/usr/dt/bin/dtdspmsg
+DTDSPMSG=CDE_INSTALLATION_TOP/bin/dtdspmsg
 
 if [ -z "$SESSIONTYPE" ]
 then
@@ -30,19 +30,19 @@ fi
 
 if [ -z "$SDT_ALT_SESSION" ]
 then
-       export SDT_ALT_SESSION="/usr/dt/config/Xsession.ow2"
+       export SDT_ALT_SESSION="CDE_INSTALLATION_TOP/config/Xsession.ow2"
 fi
 
 if [ -z "$SDT_ALT_HELLO" ]
 then
   if [ -x $DTDSPMSG ]; then 
-     export SDT_ALT_HELLO="/usr/dt/bin/dthello -string '`$DTDSPMSG -s 37 /usr/dt/lib/nls/msg/$LANG/dthello.cat 1 'Starting the OpenWindows Desktop'`' &"
+     export SDT_ALT_HELLO="CDE_INSTALLATION_TOP/bin/dthello -string '`$DTDSPMSG -s 37 CDE_INSTALLATION_TOP/lib/nls/msg/$LANG/dthello.cat 1 'Starting the OpenWindows Desktop'`' &"
   else
-     export SDT_ALT_HELLO="/usr/dt/bin/dthello -string 'Starting the OpenWindows Desktop' &"
+     export SDT_ALT_HELLO="CDE_INSTALLATION_TOP/bin/dthello -string 'Starting the OpenWindows Desktop' &"
   fi
 fi
 
 export SDT_NO_DSDM=""
 
 
-/usr/dt/bin/Xsession
+CDE_INSTALLATION_TOP/bin/Xsession

diff --git a/cde/programs/dtlogin/config/Xsession.src b/cde/programs/dtlogin/config/Xsession.src
index 6504d839d4f0df693ba76c8082f24a691fad6e1c..afee698bfa5dedc0785d57feef33718b11b7953a 100644 (file)
--- a/cde/programs/dtlogin/config/Xsession.src
+++ b/cde/programs/dtlogin/config/Xsession.src
@@ -76,7 +76,7 @@ XCOMM ##########################################################################
 #  define cpp_XINITUSER "$HOME/.xinitrc"
 #  define cpp_XDMSYS "/etc/X11/Xsession"
 #  undef cpp_HELLO
-#  define cpp_HELLO "$DT_BINPATH/dthello -file /usr/dt/copyright &"
+#  define cpp_HELLO "$DT_BINPATH/dthello -file CDE_INSTALLATION_TOP/copyright &"
 #endif
 
 #ifdef __FreeBSD__
@@ -84,7 +84,7 @@ XCOMM ##########################################################################
 #  define cpp_XINITUSER "$HOME/.xinitrc"
 #  define cpp_XDMSYS "/usr/local/lib/X11/xdm/Xsession"
 #  undef cpp_HELLO
-#  define cpp_HELLO "$DT_BINPATH/dthello -file /usr/dt/copyright &"
+#  define cpp_HELLO "$DT_BINPATH/dthello -file CDE_INSTALLATION_TOP/copyright &"
 #endif
 
 #ifdef __OpenBSD__
@@ -92,7 +92,7 @@ XCOMM ##########################################################################
 #  define cpp_XINITUSER "$HOME/.xinitrc"
 #  define cpp_XDMSYS "/etc/X11/xdm/Xsession"
 #  undef cpp_HELLO
-#  define cpp_HELLO "$DT_BINPATH/dthello -file /usr/dt/copyright &"
+#  define cpp_HELLO "$DT_BINPATH/dthello -file CDE_INSTALLATION_TOP/copyright &"
 #endif
 
 
@@ -602,13 +602,13 @@ StartFirst()
       sh | bash) $SHELL -c "$source_profile; \
                           unset DT; \
                           $dtdbcache; \
-                           PATH=/usr/dt/bin:\$PATH $tooltalk;   \
+                           PATH=CDE_INSTALLATION_TOP/bin:\$PATH $tooltalk;   \
                            $startup > $dtstart_sessionlogfile 2>&1" ;;
 
       ksh | ksh93 | dtksh) $SHELL -c "$source_profile; \
                           unset DT; \
                           $dtdbcache; \
-                           PATH=/usr/dt/bin:\$PATH $tooltalk;\
+                           PATH=CDE_INSTALLATION_TOP/bin:\$PATH $tooltalk;\
                            $startup >| $dtstart_sessionlogfile 2>&1" ;;
 
       csh | tcsh) $SHELL -c "unsetenv _ PWD;       \

diff --git a/cde/programs/dtlogin/config/Xsetup.src b/cde/programs/dtlogin/config/Xsetup.src
index 3060ad85d38d5e4f941f8c042af2348cd9fc6a88..9b7dd47426adf9a1d4e3fcba120e654f95f7c076 100644 (file)
--- a/cde/programs/dtlogin/config/Xsetup.src
+++ b/cde/programs/dtlogin/config/Xsetup.src
@@ -72,8 +72,8 @@ fi
 
 #ifdef sun
   if [ ! -f /etc/pam.conf ]; then
-    if [ -f /usr/dt/config/sys.pam.conf ]; then
-      /bin/cp /usr/dt/config/sys.pam.conf /etc/pam.conf
+    if [ -f CDE_INSTALLATION_TOP/config/sys.pam.conf ]; then
+      /bin/cp CDE_INSTALLATION_TOP/config/sys.pam.conf /etc/pam.conf
       /bin/chmod 644 /etc/pam.conf
     fi
   fi

diff --git a/cde/programs/dtlogin/config/current.session.src b/cde/programs/dtlogin/config/current.session.src
index af144fba2b795ded5284e9ec1d87094d83b8620c..5de9f4ef714d7ee13d841f75a32125f6f7f4ce24 100644 (file)
--- a/cde/programs/dtlogin/config/current.session.src
+++ b/cde/programs/dtlogin/config/current.session.src
@@ -37,6 +37,6 @@
 Dtlogin*altDtsIncrement:       True
 
 Dtlogin*altDtName:     %|nls-2-#Current#|
-Dtlogin*altDtKey:      /usr/dt/bin/Xsession
-Dtlogin*altDtStart:    /usr/dt/bin/Xsession -session current
+Dtlogin*altDtKey:      CDE_INSTALLATION_TOP/bin/Xsession
+Dtlogin*altDtStart:    CDE_INSTALLATION_TOP/bin/Xsession -session current
 

diff --git a/cde/programs/dtlogin/config/display.current.session.src b/cde/programs/dtlogin/config/display.current.session.src
index 8ce002f9738b2a07bb88a8fdb5e627be8ec0f206..16a19a46086bd2eb57420a7ffbe46409b080515d 100644 (file)
--- a/cde/programs/dtlogin/config/display.current.session.src
+++ b/cde/programs/dtlogin/config/display.current.session.src
@@ -37,5 +37,5 @@
 Dtlogin*altDtsIncrement:       True
 
 Dtlogin*altDtName:     %DisplayName%%|nls-2-#Current#|
-Dtlogin*altDtKey:      /usr/dt/bin/Xsession
-Dtlogin*altDtStart:    /usr/dt/bin/Xsession -session display-current
+Dtlogin*altDtKey:      CDE_INSTALLATION_TOP/bin/Xsession
+Dtlogin*altDtStart:    CDE_INSTALLATION_TOP/bin/Xsession -session display-current

diff --git a/cde/programs/dtlogin/config/display.home.session.src b/cde/programs/dtlogin/config/display.home.session.src
index 836f01bfc3e11cb34e0e90041bab075f666e0ee9..104bb31eeacbff90e6f89ac6f75ea1e17d18cfe5 100644 (file)
--- a/cde/programs/dtlogin/config/display.home.session.src
+++ b/cde/programs/dtlogin/config/display.home.session.src
@@ -37,5 +37,5 @@
 Dtlogin*altDtsIncrement:       True
 
 Dtlogin*altDtName:     %DisplayName%%|nls-1-#Home#|
-Dtlogin*altDtKey:      /usr/dt/bin/Xsession
-Dtlogin*altDtStart:    /usr/dt/bin/Xsession -session display-home
+Dtlogin*altDtKey:      CDE_INSTALLATION_TOP/bin/Xsession
+Dtlogin*altDtStart:    CDE_INSTALLATION_TOP/bin/Xsession -session display-home

diff --git a/cde/programs/dtlogin/config/home.session.src b/cde/programs/dtlogin/config/home.session.src
index 6edd96697f44d0ac42d570660da7afda5f991b32..57c3484b11952a1b4cec20427e06708eb29452d8 100644 (file)
--- a/cde/programs/dtlogin/config/home.session.src
+++ b/cde/programs/dtlogin/config/home.session.src
@@ -37,5 +37,5 @@
 Dtlogin*altDtsIncrement:       True
 
 Dtlogin*altDtName:     %|nls-1-#Home#|
-Dtlogin*altDtKey:      /usr/dt/bin/Xsession
-Dtlogin*altDtStart:    /usr/dt/bin/Xsession -session home
+Dtlogin*altDtKey:      CDE_INSTALLATION_TOP/bin/Xsession
+Dtlogin*altDtStart:    CDE_INSTALLATION_TOP/bin/Xsession -session home