See patch.
>From 25a49969a94615a7e4abcc000332caa1704a0b17 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf <pascal.stu...@cubes.de>
Date: Mon, 22 Jul 2013 22:14:45 +0200
Subject: [PATCH] s,/usr/dt,CDE_INSTALLATION_TOP,g in dtlogin/config
---
cde/programs/dtlogin/config/0015.sun.env.src | 4 ++--
cde/programs/dtlogin/config/Xconfig.src | 4 ++--
cde/programs/dtlogin/config/Xresources.ow.src | 2 +-
cde/programs/dtlogin/config/Xresources.src | 2 +-
cde/programs/dtlogin/config/Xsession.ow.src | 10 +++++-----
cde/programs/dtlogin/config/Xsession.src | 10 +++++-----
cde/programs/dtlogin/config/Xsetup.src | 4 ++--
cde/programs/dtlogin/config/current.session.src | 4 ++--
cde/programs/dtlogin/config/display.current.session.src | 4 ++--
cde/programs/dtlogin/config/display.home.session.src | 4 ++--
cde/programs/dtlogin/config/home.session.src | 4 ++--
11 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/cde/programs/dtlogin/config/0015.sun.env.src
b/cde/programs/dtlogin/config/0015.sun.env.src
index f9af9fa..d57d6dc 100644
--- 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 16cbe4b..57f0ec9 100644
--- 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 86ac7ae..42f1d27 100644
--- 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 9930c98..65cd558 100644
--- 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 9d277c7..5dba57a 100644
--- 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 6504d83..afee698 100644
--- 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 3060ad8..9b7dd47 100644
--- 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 af144fb..5de9f4e 100644
--- 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 8ce002f..16a19a4 100644
--- 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 836f01b..104bb31 100644
--- 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 6edd966..57c3484 100644
--- 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
--
1.8.3.1
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
