From: Pascal Stumpf <Pascal.Stumpf@cubes.de>
Date: Tue, 6 Aug 2013 12:21:48 +0000 (+0200)
Subject: dtlp: Fix the path to DtFuncs.dtsh if CDE_INSTALLATION_TOP != /usr/dt.
X-Git-Tag: 2.2.1~35
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=335a00c6f11399c396a41671d109f8d6247a7eea;p=oweals%2Fcde.git

dtlp: Fix the path to DtFuncs.dtsh if CDE_INSTALLATION_TOP != /usr/dt.

While here, also point the man page to the correct default location.
---

diff --git a/cde/doc/C/guides/man/man1_dt/lp.sgm b/cde/doc/C/guides/man/man1_dt/lp.sgm
index e71ab9f5..ac5ee908 100644
--- a/cde/doc/C/guides/man/man1_dt/lp.sgm
+++ b/cde/doc/C/guides/man/man1_dt/lp.sgm
@@ -443,7 +443,7 @@ otherwise, the filename itself will be used as the page header.
 <Term>4</Term>
 <ListItem>
 <Para>Unable to find the <Command>dtksh</Command> initialization file,
-<Filename>/usr/dt/scripts/DtFuncs.sh</Filename>.
+<Filename>/usr/dt/lib/dtksh/DtFuncs.dtsh</Filename>.
 </Para>
 </ListItem>
 </VarListEntry>
diff --git a/cde/programs/dtprintegrate/dtlp.src b/cde/programs/dtprintegrate/dtlp.src
index bffa2f6e..9d94e03e 100755
--- a/cde/programs/dtprintegrate/dtlp.src
+++ b/cde/programs/dtprintegrate/dtlp.src
@@ -1711,9 +1711,9 @@ then
         Exit $failure_flag
     fi
 else
-    if [[ -r "/usr/dt/lib/dtksh/DtFuncs.dtsh" ]]
+    if [[ -r CDE_INSTALLATION_TOP/lib/dtksh/DtFuncs.dtsh ]]
     then
-        . /usr/dt/lib/dtksh/DtFuncs.dtsh
+        . CDE_INSTALLATION_TOP/lib/dtksh/DtFuncs.dtsh
     else
         failure_flag=1
         echo Sorry--cannot find initialization file.