Use /var/spool instead of /usr/spool and /var/mail instead of /usr/mail

diff --git a/cde/doc/C/guides/man/man1_dt/cm_delet.sgm b/cde/doc/C/guides/man/man1_dt/cm_delet.sgm
index 55dc7b5155fc1ec60ffbdccf0321d0c02427c85f..82f453dfb9d6784c8d2a6b8ccaa9915659109180 100644 (file)
--- a/cde/doc/C/guides/man/man1_dt/cm_delet.sgm
+++ b/cde/doc/C/guides/man/man1_dt/cm_delet.sgm
@@ -262,7 +262,7 @@ for the processing of
 </Para></RefSect1>
 <![ %CDE.C.CDE; [<RefSect1>
 <Title>FILES</Title>
-<Para><Filename>/usr/spool/calendar/callog.username</Filename>,
+<Para><Filename>/var/spool/calendar/callog.username</Filename>,
 <Filename>/usr/dt/bin/rpc.cmsd</Filename></Para>
 </RefSect1>]]>
 <RefSect1>

diff --git a/cde/doc/C/guides/man/man1_dt/cm_inser.sgm b/cde/doc/C/guides/man/man1_dt/cm_inser.sgm
index bf01f6f00d8b63199168405e7479ce7bbc9e1fbd..210c1cf27574c58625209cfe103dfd07ba01eb5e 100644 (file)
--- a/cde/doc/C/guides/man/man1_dt/cm_inser.sgm
+++ b/cde/doc/C/guides/man/man1_dt/cm_inser.sgm
@@ -302,7 +302,7 @@ for the specified view span, including the appointment just
 </Para></RefSect1>
 <![ %CDE.C.CDE; [<RefSect1>
 <Title>FILES</Title>
-<Para><Filename>/usr/spool/calendar/callog.username</Filename>,
+<Para><Filename>/var/spool/calendar/callog.username</Filename>,
 <Filename>/usr/dt/bin/rpc.cmsd</Filename></Para>
 </RefSect1>]]>
 <RefSect1>

diff --git a/cde/doc/C/guides/man/man1_dt/cm_looku.sgm b/cde/doc/C/guides/man/man1_dt/cm_looku.sgm
index 1f61763812064e5008829cf9e4adb3fe7d1ce841..d60ba9e8c7e7389c3a7f2543898040c8054cbeb8 100644 (file)
--- a/cde/doc/C/guides/man/man1_dt/cm_looku.sgm
+++ b/cde/doc/C/guides/man/man1_dt/cm_looku.sgm
@@ -264,7 +264,7 @@ for the specified view
 </Para></RefSect1>
 <![ %CDE.C.CDE; [<RefSect1>
 <Title>FILES</Title>
-<Para><Filename>/usr/spool/calendar/callog.username</Filename>,
+<Para><Filename>/var/spool/calendar/callog.username</Filename>,
 <Filename>/usr/dt/bin/rpc.cmsd</Filename></Para>
 </RefSect1>]]>
 <RefSect1>

diff --git a/cde/doc/C/guides/man/man1_dt/login.sgm b/cde/doc/C/guides/man/man1_dt/login.sgm
index fe6b2572bfc8bd30a114d72faeeddc8e0d4d166f..3dd2bda4842bccb129625fd6886eab017da3e86f 100644 (file)
--- a/cde/doc/C/guides/man/man1_dt/login.sgm
+++ b/cde/doc/C/guides/man/man1_dt/login.sgm
@@ -1625,7 +1625,7 @@ the following default environment:</para>
 </refsect2>
 <refsect2>
 <title>MAIL</title>
-<para>is set to <Filename>/usr/mail/$USER</Filename> (system dependent)</para>
+<para>is set to <Filename>/var/mail/$USER</Filename> (system dependent)</para>
 </refsect2>
 <refsect2>
 <title>PATH</title>
@@ -1673,7 +1673,7 @@ constants because no shell is used to parse the string. See the Resources
 section for details on setting this resource.</para>
 <para>For example:</para>
 <programlisting>
-MAIL=/usr/mail/$USER
+MAIL=/var/mail/$USER
 </programlisting>
 <para>Finally, personal environment variables can be set on a per-user basis
 in the script file <Filename>$HOME/.dtprofile</Filename>.</para>

diff --git a/cde/doc/C/guides/man/man5/dtenvvar.sgm b/cde/doc/C/guides/man/man5/dtenvvar.sgm
index 7e851d7196de1a700bf94029497853482fec06e0..201d0855afca30d1a9232093cd219e4a0eb5239d 100644 (file)
--- a/cde/doc/C/guides/man/man5/dtenvvar.sgm
+++ b/cde/doc/C/guides/man/man5/dtenvvar.sgm
@@ -422,7 +422,7 @@ Refer to
 <Term><Emphasis>MAIL</Emphasis></Term>
 <ListItem>
 <Para>Is set to
-<Filename>/usr/mail/$USER</Filename> (system dependent).
+<Filename>/var/mail/$USER</Filename> (system dependent).
 Refer to
 &cdeman.dtlogin; for more information.
 </Para>

diff --git a/cde/doc/C/help/Loginmgr/Tasks.sgm b/cde/doc/C/help/Loginmgr/Tasks.sgm
index 9c1d79f4fc5f0a0b66107d81b72677b3523da2e4..3e828747350aacb620cb136e7802060facf9e5d2 100644 (file)
--- a/cde/doc/C/help/Loginmgr/Tasks.sgm
+++ b/cde/doc/C/help/Loginmgr/Tasks.sgm
@@ -516,7 +516,7 @@ sets the following environment variables for each user:
 <VarListEntry>
 <Term>MAIL</Term>
 <ListItem>
-<Para>set to "/usr/mail/$USER"
+<Para>set to "/var/mail/$USER"
 </Para>
 </ListItem>
 </VarListEntry>
@@ -632,7 +632,7 @@ section and a section for variables that apply to both environments.</Para>
     stty ...
     tset ...
     DISPLAY=mydisplay:0
-    MAIL=/usr/mail/$USER
+    MAIL=/var/mail/$USER
     EDITOR=/bin/vi
                ...
   fi       
@@ -656,7 +656,7 @@ section and a section for variables that apply to both environments.</Para>
      stty ...
      tset ...
      setenv DISPLAY mydisplay:0
-     setenv MAIL /usr/mail/$USER
+     setenv MAIL /var/mail/$USER
      setenv EDITOR /bin/vi
          ...
   fi

diff --git a/cde/doc/de_DE.ISO8859-1/help/Loginmgr/Tasks.sgm b/cde/doc/de_DE.ISO8859-1/help/Loginmgr/Tasks.sgm
index 9eed122a41ee32aabf55ef0e64eea3a122244bf3..7523a6d9c34ca7562c0d0b761ed4eccacdc01703 100644 (file)
--- a/cde/doc/de_DE.ISO8859-1/help/Loginmgr/Tasks.sgm
+++ b/cde/doc/de_DE.ISO8859-1/help/Loginmgr/Tasks.sgm
@@ -498,7 +498,7 @@ jeden Benutzer fest:
 <VarListEntry>
 <Term>MAIL</Term>
 <ListItem>
-<Para>festgelegt auf "/usr/mail/$USER"
+<Para>festgelegt auf "/var/mail/$USER"
 </Para>
 </ListItem>
 </VarListEntry>
@@ -614,7 +614,7 @@ beide Umgebungen g
     stty ...
     tset ...
     DISPLAY=mydisplay:0
-    MAIL=/usr/mail/$USER
+    MAIL=/var/mail/$USER
     EDITOR=/bin/vi
                 ...
   fi
@@ -638,7 +638,7 @@ beide Umgebungen g
      stty ...
      tset ...
      setenv DISPLAY mydisplay:0
-     setenv MAIL /usr/mail/$USER
+     setenv MAIL /var/mail/$USER
      setenv EDITOR /bin/vi
          ...
   fi

diff --git a/cde/doc/es_ES.ISO8859-1/help/Loginmgr/Tasks.sgm b/cde/doc/es_ES.ISO8859-1/help/Loginmgr/Tasks.sgm
index ca9ee7c155dc247772c64e6ca3a96251ab8d7273..e9fd132a1e79cb3b4ef9698b785108050198ac2c 100644 (file)
--- a/cde/doc/es_ES.ISO8859-1/help/Loginmgr/Tasks.sgm
+++ b/cde/doc/es_ES.ISO8859-1/help/Loginmgr/Tasks.sgm
@@ -409,7 +409,7 @@ de entorno para cada usuario:</para>
 </varlistentry>
 <varlistentry><term>MAIL</term>
 <listitem>
-<para>se establece en "/usr/mail/$USER"</para>
+<para>se establece en "/var/mail/$USER"</para>
 </listitem>
 </varlistentry>
 <varlistentry><term>PATH</term>
@@ -500,7 +500,7 @@ ambos entornos.</para>
     stty ...
     tset ...
     DISPLAY=mydisplay:0
-    MAIL=/usr/mail/$USER
+    MAIL=/var/mail/$USER
     EDITOR=/bin/vi
                 ...
   fi
@@ -523,7 +523,7 @@ ambos entornos.</para>
      stty ...
      tset ...
      setenv DISPLAY mydisplay:0
-     setenv MAIL /usr/mail/$USER
+     setenv MAIL /var/mail/$USER
      setenv EDITOR /bin/vi
          ...
   fi

diff --git a/cde/doc/fr_FR.ISO8859-1/help/Loginmgr/Tasks.sgm b/cde/doc/fr_FR.ISO8859-1/help/Loginmgr/Tasks.sgm
index 7ddecc60f4f4413ca963b629e8415ed84d5d45dd..cc3f04262da4a788ac186f0a515c5100ca9b6613 100644 (file)
--- a/cde/doc/fr_FR.ISO8859-1/help/Loginmgr/Tasks.sgm
+++ b/cde/doc/fr_FR.ISO8859-1/help/Loginmgr/Tasks.sgm
@@ -414,7 +414,7 @@ Bureau.</para>
 </varlistentry>
 <varlistentry><term>MAIL</term>
 <listitem>
-<para>prend la valeur "/usr/mail/$USER".</para>
+<para>prend la valeur "/var/mail/$USER".</para>
 </listitem>
 </varlistentry>
 <varlistentry><term>PATH</term>
@@ -506,7 +506,7 @@ qui s'appliquent aux deux environnements.</para>
     stty ...
     tset ...
     DISPLAY=mydisplay:0
-    MAIL=/usr/mail/$USER
+    MAIL=/var/mail/$USER
     EDITOR=/bin/vi
                 ...
   fi
@@ -529,7 +529,7 @@ qui s'appliquent aux deux environnements.</para>
      stty ...
      tset ...
      setenv DISPLAY mydisplay:0
-     setenv MAIL /usr/mail/$USER
+     setenv MAIL /var/mail/$USER
      setenv EDITOR /bin/vi
          ...
   fi

diff --git a/cde/doc/it_IT.ISO8859-1/help/Loginmgr/Tasks.sgm b/cde/doc/it_IT.ISO8859-1/help/Loginmgr/Tasks.sgm
index 6d34512e30f4a8879954e119c79bd0ce52301c04..df33382174e3a293d74fec8b83b479b4433540a6 100644 (file)
--- a/cde/doc/it_IT.ISO8859-1/help/Loginmgr/Tasks.sgm
+++ b/cde/doc/it_IT.ISO8859-1/help/Loginmgr/Tasks.sgm
@@ -405,7 +405,7 @@ per ogni utente:</para>
 </varlistentry>
 <varlistentry><term>MAIL</term>
 <listitem>
-<para>viene impostata come "/usr/mail/$USER"</para>
+<para>viene impostata come "/var/mail/$USER"</para>
 </listitem>
 </varlistentry>
 <varlistentry><term>PATH</term>
@@ -497,7 +497,7 @@ senza il desktop e in una per le variabili applicabili a entrambi gli ambienti.
     stty ...
     tset ...
     DISPLAY=mydisplay:0
-    MAIL=/usr/mail/$USER
+    MAIL=/var/mail/$USER
     EDITOR=/bin/vi
                ...
   fi       
@@ -519,7 +519,7 @@ senza il desktop e in una per le variabili applicabili a entrambi gli ambienti.
      stty ...
      tset ...
      setenv DISPLAY mydisplay:0
-     setenv MAIL /usr/mail/$USER
+     setenv MAIL /var/mail/$USER
      setenv EDITOR /bin/vi
          ...
   fi

diff --git a/cde/doc/ja_JP.dt-eucJP/help/Loginmgr/Tasks.sgm b/cde/doc/ja_JP.dt-eucJP/help/Loginmgr/Tasks.sgm
index f8199fd85fba4df1718a5ae80a1e8de3fc7ff3e6..448e20f194bebeb32a5d354e6b6a9e50acd4d176 100644 (file)
--- a/cde/doc/ja_JP.dt-eucJP/help/Loginmgr/Tasks.sgm
+++ b/cde/doc/ja_JP.dt-eucJP/help/Loginmgr/Tasks.sgm
@@ -502,7 +502,7 @@
 <VarListEntry>
 <Term>MAIL</Term>
 <ListItem>
-<Para>     "/usr/mail/$USER" ¤ËÀßÄꤷ¤Þ¤¹¡£
+<Para>     "/var/mail/$USER" ¤ËÀßÄꤷ¤Þ¤¹¡£
 </Para>
 </ListItem>
 </VarListEntry>
@@ -609,7 +609,7 @@
     stty ...
     tset ...
     DISPLAY=mydisplay:0
-    MAIL=/usr/mail/$USER
+    MAIL=/var/mail/$USER
     EDITOR=/bin/vi
                ...
   fi       
@@ -633,7 +633,7 @@
      stty ...
      tset ...
      setenv DISPLAY mydisplay:0
-     setenv MAIL /usr/mail/$USER
+     setenv MAIL /var/mail/$USER
      setenv EDITOR /bin/vi
          ...
   fi

diff --git a/cde/lib/DtSearch/tiny.txt b/cde/lib/DtSearch/tiny.txt
index e28f1109ebd590acfddc12517f410ff3ada14bb7..1c723bf7d21f9fb26e723208f511ef3ca9aa13d3 100644 (file)
--- a/cde/lib/DtSearch/tiny.txt
+++ b/cde/lib/DtSearch/tiny.txt
@@ -1080,7 +1080,7 @@
   
   The full path name of an execute file is a form of the following:
   
-  /usr/spool/uucp/System/X.SystemNxxxx
+  /var/spool/uucp/System/X.SystemNxxxx
   
   After creating the files in the spooling directory, the uux com-
   mand calls the  uucico daemon to transfer the files from the
@@ -1159,7 +1159,7 @@
   system name.
   
   Note: The notation \~ (tilde) is the shorthand way of specifying
-  the public spooling directory,  /usr/spool/uucppublic.
+  the public spooling directory,  /var/spool/uucppublic.
   
   Flags
   
@@ -1260,7 +1260,7 @@
   pared to the /u/amy/f2 file on the remote system hera and the
   output is placed in the f1.diff file in the local public directo-
   ry    (the    full    path     name     of     this    file    is
-  /usr/spool/uucppublic/f1.diff).   The destina-
+  /var/spool/uucppublic/f1.diff).   The destina-
   tion name must be entered either  preceded  by a > with the whole
   command string enclosed in " " (quotation marks) or entered en-
   closed in braces and backslashes, as \{ DestinationName \}.
@@ -1327,9 +1327,9 @@
   
   /usr/bin/uux  Specifies the command pathname.
   
-   /usr/spool/uucp      Is the spooling directory.
+   /var/spool/uucp      Is the spooling directory.
   
-   /usr/spool/uucppublic        Is the public directory.
+   /var/spool/uucppublic        Is the public directory.
   
   Suggested Reading
   
@@ -3695,7 +3695,7 @@
   
   Files
   
-  /usr/spool/rwho/whod.*        Indicates data files received from remote
+  /var/spool/rwho/whod.*        Indicates data files received from remote
   rwhod daemons.
   
   /usr/ucb/ruptime      Command executable file.
@@ -6158,7 +6158,7 @@
   
   Files
   
-  /usr/spool/Mail/$USER file    Defines the location of the mail drop.
+  /var/Mail/$USER file    Defines the location of the mail drop.
   
   /usr/bin/mhmail file  Contains the executable form of the mhmail
   command.
@@ -6213,7 +6213,7 @@
   destination  files  and  the  sender's login name.  The full path
   name of a command file is a form of the following:
   
-  /usr/spool/uucp/SystemName/C.SystemNameNxxxx
+  /var/spool/uucp/SystemName/C.SystemNameNxxxx
   
   where N is the grade of the request and xxxx is the hexadecimal
   sequence number used by BNU.
@@ -6224,7 +6224,7 @@
   the actual source file.  The full  path  name of a data file is a
   form of the following:
   
-  /usr/spool/uucp/SystemName/D.SystemNamexxxx###
+  /var/spool/uucp/SystemName/D.SystemNamexxxx###
   
   Once the command files (and data files, if necessary) are creat-
   ed, the uucp command then calls the  uucico daemon, which in turn
@@ -6283,11 +6283,11 @@
   User is a login name on the remote system.  The specified
   user's  login directory is then considered the destination of the
   transfer.  If the user specifies an invalid login name, the files
-  are transferred to the public directory,  /usr/spool/uucppublic,
+  are transferred to the public directory,  /var/spool/uucppublic,
   which is the default.
   
   *     A path name preceded by \~/Destination, where Destination is ap-
-  pended to /usr/spool/uucppublic.  The destination is treated as a
+  pended to /var/spool/uucppublic.  The destination is treated as a
   file  name  unless more than one file is being transferred by the
   request, the destination already exists as a directory on the re-
   mote system, or the destination is specified as a directory.
@@ -6363,7 +6363,7 @@
   -m    Sends a mail message to the requester when the source file is
   successfully copied to the destination file  on  a remote system.
   The    message    is    sent    to   the   requester's   mailbox,
-  /usr/spool/mail/User.  The  mail com-
+  /var/mail/User.  The  mail com-
   mand does not send a message for a local transfer.
   
   The -m flag works only when sending files or receiving a single
@@ -6403,7 +6403,7 @@
   2.    To copy a file from the remote system and place it in the pub-
   lic directory, enter:
   
-  uucp hera!geo/f2 /usr/spool/uucppublic/f2
+  uucp hera!geo/f2 /var/spool/uucppublic/f2
   
   In this example, the f2 file from remote system hera is copied
   and placed in the public directory.
@@ -6432,15 +6432,15 @@
   
    /usr/lib/uucp/Systems        File describing accessible remote systems
   
-   /usr/spool/uucp      Spooling directory containing BNU status informa-
+   /var/spool/uucp      Spooling directory containing BNU status informa-
   tion
   
-   /usr/spool/uucppublic        Public directory containing files awaiting
+   /var/spool/uucppublic        Public directory containing files awaiting
   transfer by the uucico daemon
   
-  /usr/spool/uucppublic/SystemName/ C.* Command files
+  /var/spool/uucppublic/SystemName/ C.* Command files
   
-  /usr/spool/uucppublic/SystemName/ D.* Data files.
+  /var/spool/uucppublic/SystemName/ D.* Data files.
   
   Suggested Reading
   
@@ -6561,7 +6561,7 @@
   Example
   
   To run the uudemon.admin command automatically, edit the
-  /usr/spool/cron/crontabs/uucp file and  remove
+  /var/spool/cron/crontabs/uucp file and  remove
   the  comment  character   (#)   from   the   beginning   of  the
   uudemon.admin command line.  Change:
   
@@ -6598,7 +6598,7 @@
    /etc/locks directory Contains lock files which prevent multiple
   uses of devices and multiple calls to systems.
   
-  /usr/spool/cron/crontabs/uucp file    Schedules BNU jobs, including
+  /var/spool/cron/crontabs/uucp file    Schedules BNU jobs, including
   the uudemon.admin command, for the cron daemon.
   
   Suggested Reading
@@ -8396,7 +8396,7 @@
   /usr/lib/mh/mtstailor file    Tailors the MH environment to the local
   environment.
   
-  /usr/spool/mail/$USER file    Speciefies the location of the mail
+  /var/mail/$USER file    Speciefies the location of the mail
   drop.
   
   /usr/bin/inc file     Contains the executable form of the inc command.
@@ -10656,7 +10656,7 @@
   and then adds this message to the user's mailbox.
   
   The action of the bellmail command can be modified in two ways by
-  manipulating the /usr/spool/mail/UserID mailbox file:
+  manipulating the /var/mail/UserID mailbox file:
   
   *     The default permission assignment for "others" is "all permis-
   sions   denied"  (660).    If  you  change  this  permission   to
@@ -10686,7 +10686,7 @@
   Flags
   
   -dDirectoryPath       Saves mail in the named directory instead of the
-  default directory, /usr/spool/mail.  Cannot be specified with the
+  default directory, /var/mail.  Cannot be specified with the
    -fFile flag.
   
   -e    Does not display any messages.  This flag causes the bellmail
@@ -10737,7 +10737,7 @@
   
   p     Displays the current message again.
   
-  q     Writes any mail not yet deleted to the /usr/spool/mail/UserID
+  q     Writes any mail not yet deleted to the /var/mail/UserID
   file and exits.  Pressing  END  OF FILE (Ctrl-D) has the same ef-
   fect.
   
@@ -10747,7 +10747,7 @@
   w [File]      Saves the message, without its postmark, in the specified
   File parameter instead of in the default mail file $HOME/mbox.
   
-  x     Writes all mail unchanged to /usr/spool/mail/UserID and exits.
+  x     Writes all mail unchanged to /var/mail/UserID and exits.
   
   Examples
   
@@ -10811,9 +10811,9 @@
   
   $HOME/mbox    Your personal mailbox
   
-  /usr/mail/*.lock      Lock for mail directory
+  /var/mail/*.lock      Lock for mail directory
   
-  /usr/spool/mail/UserID        Default system mailbox for UserID
+  /var/mail/UserID        Default system mailbox for UserID
   
   /usr/bin/bellmail     Bellmail program.
   
@@ -10892,7 +10892,7 @@
   
   Files
   
-  /usr/spool/mail/*     System mailboxes for all users
+  /var/mail/*     System mailboxes for all users
   
   /usr/bin/from User mailbox files
   

diff --git a/cde/lib/DtWidget/Control.c b/cde/lib/DtWidget/Control.c
index f42d72c61329ef9c3584b6cad5dd34d7e25d7a87..2c74b973fcd7e4a72769683105d99885034c76f9 100644 (file)
--- a/cde/lib/DtWidget/Control.c
+++ b/cde/lib/DtWidget/Control.c
@@ -165,13 +165,7 @@ WidgetClass        dtControlGadgetClass;
 #define UNSPECIFIED_DIMENSION  9999
 #define UNSPECIFIED_CHAR       255
 
-#ifdef _SUN_OS
 static const char _DtMsgIndicator_0000[] = "/var/mail/";
-#elif defined(__osf__)
-static const char _DtMsgIndicator_0000[] = "/usr/spool/mail/";
-#else
-static const char _DtMsgIndicator_0000[] = "/usr/mail/";
-#endif
 
 #define        MAIL_DIR        _DtMsgIndicator_0000
 #define Min(x, y)    (((x) < (y)) ? (x) : (y))

diff --git a/cde/lib/DtWidget/DtMsgs.c b/cde/lib/DtWidget/DtMsgs.c
index 5653c05619bdfc0e43fdb74fa2f2716185d3a89c..6d48c757363f84d41a8258ecf9d1afce2e3a39f9 100644 (file)
--- a/cde/lib/DtWidget/DtMsgs.c
+++ b/cde/lib/DtWidget/DtMsgs.c
@@ -229,13 +229,8 @@ CONST char _DtMsgIcon_0005[] =
 
 
 /*** Indicator.c ***/
-#ifdef _SUN_OS
 CONST char _DtMsgIndicator_0000[] =
-   "/usr/spool/mail/";
-#else
-CONST char _DtMsgIndicator_0000[] =
-   "/usr/mail/";
-#endif
+   "/var/mail/";
 
 /*** MenuButton.c ***/
 CONST char _DtMsgMenuButton_0000[] =

diff --git a/cde/programs/dtcm/server/log.h b/cde/programs/dtcm/server/log.h
index ff9ad3b8885d0ea724bcadeda2d63731e79ce043..db7a84a299b7177ddd3f3fd6bc3464ba9534a4d6 100644 (file)
--- a/cde/programs/dtcm/server/log.h
+++ b/cde/programs/dtcm/server/log.h
@@ -41,11 +41,7 @@
 #define _DtCMS_DEFAULT_BAK     ".calbak"
 #define _DtCMS_DEFAULT_TMP     ".caltmp"
 #define _DtCMS_DEFAULT_DEL     ".caldel"
-#if defined(CSRG_BASED) || defined (linux)
 #define        _DtCMS_DEFAULT_DIR      "/var/spool/calendar"
-#else
-#define        _DtCMS_DEFAULT_DIR      "/usr/spool/calendar"
-#endif
 #define        _DtCMS_DEFAULT_MODE     (S_IRUSR|S_IRGRP|S_IWGRP)
 
 typedef enum {

diff --git a/cde/programs/dtksh/ksh93/ship/README b/cde/programs/dtksh/ksh93/ship/README
index 8b0f526b42441d069b3fe5a76f722066439d74fb..81894296eec60f94ed99d97fd3fea767d094ca23 100644 (file)
--- a/cde/programs/dtksh/ksh93/ship/README
+++ b/cde/programs/dtksh/ksh93/ship/README
@@ -1,7 +1,7 @@
 /* $XConsortium: README /main/2 1996/07/15 14:13:29 drk $ */
 Software shipment information.  [better documentation forthcoming ...]
 
-All files and directories, except for those in /usr/spool/uucppublic,
+All files and directories, except for those in /var/spool/uucppublic,
 are rooted at the shipment/installation directory named by
 $INSTALLROOT.  The $INSTALLROOT hierarchy is similar to the System V
 /usr hierarchy.
@@ -25,7 +25,7 @@ After each shipment:
        ship/shipin
 
 `ship/shipin -n' shows actions but does not unbundle or build.
-`ship/shipin -s <dir>' unbundles from <dir> rather than /usr/spool/uucppublic.
+`ship/shipin -s <dir>' unbundles from <dir> rather than /var/spool/uucppublic.
 `ship/shipin -u' unbundles the shipment but does not build.
 `ship/shipin -i' copies from spool area but does not unbundle or build.
 `ship/shipin -E' rebuild components that failed last time (use after fixes).
@@ -72,7 +72,7 @@ Each shipment is identified by a two part version number [R]YYMMDD
        R       release -- if specified then it must match for compatibility
        YYMMDD  shipment year, month and day number
 
-/usr/spool/uucppublic/<installer-login>/<shipper-system> directory hierarchy:
+/var/spool/uucppublic/<installer-login>/<shipper-system> directory hierarchy:
 
        <shipper-login>.<YYMMDD>        shipment control directory
        <shipper-login>.<YYMMDD>/manifest list of all files in shipment

diff --git a/cde/programs/dtksh/ksh93/ship/shipin b/cde/programs/dtksh/ksh93/ship/shipin
index 66c22b638f913a501659a9556445a662caceef82..70b1f8b2f879a6b585ed5b2e550b309313eb9995 100755 (executable)
--- a/cde/programs/dtksh/ksh93/ship/shipin
+++ b/cde/programs/dtksh/ksh93/ship/shipin
@@ -216,7 +216,7 @@ done
 export RECIPIENT
 case $_uuspool_ in
 "")    case $SHIPSPOOL in
-       "")     SHIPSPOOL="/usr/spool/uucppublic/$RECIPIENT/* /usr/spool/uucppublic/receive/$RECIPIENT/*" ;;
+       "")     SHIPSPOOL="/var/spool/uucppublic/$RECIPIENT/* /var/spool/uucppublic/receive/$RECIPIENT/*" ;;
        esac
        ;;
 *)     SHIPSPOOL=$_uuspool_ ;;

diff --git a/cde/programs/dtksh/ksh93/ship/shipout b/cde/programs/dtksh/ksh93/ship/shipout
index d43e82466a72cb178c1cbaa4535c81ef1d17b3c9..5ef658963472a03ad536710c40c6c48d362f7e99 100755 (executable)
--- a/cde/programs/dtksh/ksh93/ship/shipout
+++ b/cde/programs/dtksh/ksh93/ship/shipout
@@ -56,7 +56,7 @@ SHIPFILES="README shipin shipout"
 SHIPAUX="shipiffe.sh shipop.c shipproto.c"
 SHIPMENT=*[0-9][0-9][0-9][0-9][0-9][0-9]
 SHIPPER=${SHIPPER:-${USER:-${LOGNAME:-${HOME##*/}}}}
-SHIPSPOOL=${SHIPSPOOL:-/usr/spool/uucppublic}
+SHIPSPOOL=${SHIPSPOOL:-/var/spool/uucppublic}
 SHIPORG=${SHIPORG:-"Software and Systems Research"}
 SHIPLOGO=${SHIPLOGO:-"http://www1126.research.att.com/logos/attbllogo.gif align=middle"}
 SHIPMM2HTML=${SHIPMM2HTML:-mm2html}

diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/data/msg.c b/cde/programs/dtksh/ksh93/src/cmd/ksh93/data/msg.c
index 1b86e141cd84ce5dfebbaea5764844a67732ca5a..a75014346931b1903c353dce65e0788d1a4c75b1 100644 (file)
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/data/msg.c
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/data/msg.c
@@ -238,7 +238,7 @@ const char e_stdprompt[]    = "$ ";
 const char e_profile[]         = "${HOME:-.}/.profile";
 const char e_sysprofile[]      = PROFILEPATH;
 const char e_suidprofile[]     = SUIDPROFILEPATH;
-const char e_crondir[]         = "/usr/spool/cron/atjobs";
+const char e_crondir[]         = "/var/spool/cron/atjobs";
 const char e_prohibited[]      = "login setuid/setgid shells prohibited";
 #ifdef SHOPT_SUID_EXEC
    const char e_suidexec[]     = SUIDEXECPATH;

diff --git a/cde/programs/dtlogin/config/Xsession.src b/cde/programs/dtlogin/config/Xsession.src
index cc7ec43096ac42a7681fcc90c4256a20899c6eec..49bcc13934b82541f798d6f014cd73f807ceb76f 100644 (file)
--- a/cde/programs/dtlogin/config/Xsession.src
+++ b/cde/programs/dtlogin/config/Xsession.src
@@ -63,11 +63,6 @@ XCOMM ##########################################################################
 #  define cpp_HELLO "$DT_BINPATH/dthello -file $DT_INSTALL/copyright &"
 #endif
 
-#ifdef __osf__
-#  undef cpp_MAIL
-#  define cpp_MAIL "/usr/spool/mail/$USER"
-#endif
-
 #if defined (__hpux) && defined (BLS)
 #  undef cpp_HELLO
 #  define cpp_HELLO "$DT_BINPATH/dthello -file /etc/copyright -file $HOME/.dtlogininfo &"
@@ -118,7 +113,7 @@ XCOMM ##########################################################################
 #endif
 
 #if !defined (cpp_MAIL)
-#  define cpp_MAIL "/usr/mail/$USER"
+#  define cpp_MAIL "/var/mail/$USER"
 #endif
 
 #if !defined (cpp_HELLO)

diff --git a/cde/programs/dtlogin/dtlogin.man b/cde/programs/dtlogin/dtlogin.man
index d24238d1cbaff3cb4332243929b851d565ee8f02..b875c31f7b38f5eb7d70fe58b6c06bff04c461fe 100644 (file)
--- a/cde/programs/dtlogin/dtlogin.man
+++ b/cde/programs/dtlogin/dtlogin.man
@@ -176,7 +176,7 @@ environment:
        LC_ALL  is set to the current NLS language (if any)
        LC_MESSAGES     is set to the current NLS language (if any)
        LOGNAME is set to the user name
-       MAIL    is set to /usr/mail/$USER
+       MAIL    is set to /var/mail/$USER
        PATH    is set to the value of the \fBuserPath\fP resource
        USER    is set to the user name
        SHELL   is set to the user's default shell (from /etc/passwd)
@@ -225,7 +225,7 @@ For example.
 .nf
 .ta .5i 3i
 
-       MAIL=/usr/mail/$USER
+       MAIL=/var/mail/$USER
 .fi
 .sp 1
 Finally, personal environment variables can be set on a per-user basis

diff --git a/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C b/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C
index a7d8b0ef5c8fa047b23ded45078ec9891a3290c1..b2becfa6b9423730f6f72dbe82438c797ce47c09 100644 (file)
--- a/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C
+++ b/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C
@@ -345,8 +345,8 @@ typedef struct
    char *line;
 } StatusLineStruct, *StatusLine, **StatusLineList;
 
-#define TMP_DIR "/usr/spool/lp/tmp"
-#define REQ_DIR "/usr/spool/lp/requests/%s/"
+#define TMP_DIR "/var/spool/lp/tmp"
+#define REQ_DIR "/var/spool/lp/requests/%s/"
 #define SPOOL_DIR "/var/spool/lp/tmp/%s/"
 
 static void check_dir(char *printer, char *tmp_dir, StatusLineList *job_list,

diff --git a/cde/programs/dtwm/Dtwm.defs.src b/cde/programs/dtwm/Dtwm.defs.src
index fe1fe02f37a46b8a2c66bb397effcd9936ef14a4..51d9784875197428276ef9ff548e38fbbec559b8 100644 (file)
--- a/cde/programs/dtwm/Dtwm.defs.src
+++ b/cde/programs/dtwm/Dtwm.defs.src
@@ -181,16 +181,10 @@ Dtwm*VersionDialog_popup*columns: %|nls-6-40^columns|
 !#
 !# Specify the file name to use to check the mail indicator
 !#
-!# Default is /usr/mail/$LOGNAME.
+!# Default is /var/mail/$LOGNAME.
 !#
 !####
-#ifdef __osf__
-Dtwm*Mail*fileName:                            /usr/spool/mail/$LOGNAME
-#elif defined(linux)
 Dtwm*Mail*fileName:                            /var/mail/$LOGNAME
-#else
-!# Dtwm*Mail*fileName:                         /usr/mail/$LOGNAME
-#endif
 
 !####
 !#