|
 |
2b35d3 |
diff -up openmotif-2.3.3/clients/mwm/WmResParse.c.mwmrc_dir openmotif-2.3.3/clients/mwm/WmResParse.c
|
|
|
2b35d3 |
--- openmotif-2.3.3/clients/mwm/WmResParse.c.mwmrc_dir 2009-06-22 23:51:51.000000000 +0200
|
|
|
2b35d3 |
+++ openmotif-2.3.3/clients/mwm/WmResParse.c 2010-03-23 13:37:03.000000000 +0100
|
|
|
2b35d3 |
@@ -2403,7 +2403,7 @@ FILE *FopenConfigFile (void)
|
|
|
2b35d3 |
#endif /* PANELIST */
|
|
|
2b35d3 |
|
|
|
2b35d3 |
#ifndef MWMRCDIR
|
|
|
2b35d3 |
-#define MWMRCDIR "/usr/lib/X11"
|
|
|
2b35d3 |
+#define MWMRCDIR "/etc/X11/mwm"
|
|
|
2b35d3 |
#endif
|
|
|
2b35d3 |
if (LANG != NULL)
|
|
|
2b35d3 |
{
|
|
|
2b35d3 |
diff -up openmotif-2.3.3/configure.ac.mwmrc_dir openmotif-2.3.3/configure.ac
|
|
|
2b35d3 |
--- openmotif-2.3.3/configure.ac.mwmrc_dir 2009-10-27 17:10:23.000000000 +0100
|
|
|
2b35d3 |
+++ openmotif-2.3.3/configure.ac 2010-03-23 13:38:33.000000000 +0100
|
|
|
2b35d3 |
@@ -179,7 +179,7 @@ AC_SUBST(CDE_CONFIGURATION_TOP)
|
|
|
2b35d3 |
LIBDIR="${libdir}/X11"
|
|
|
2b35d3 |
AC_SUBST(LIBDIR)
|
|
|
2b35d3 |
|
|
|
2b35d3 |
-MWMRCDIR="${libdir}/X11"
|
|
|
2b35d3 |
+MWMRCDIR="/etc/X11/mwm"
|
|
|
2b35d3 |
AC_SUBST(MWMRCDIR)
|
|
|
2b35d3 |
|
|
|
2b35d3 |
INCDIR="${includedir}/X11"
|
|
|
2b35d3 |
diff -up openmotif-2.3.3/doc/man/man1/mwm.1.mwmrc_dir openmotif-2.3.3/doc/man/man1/mwm.1
|
|
|
2b35d3 |
--- openmotif-2.3.3/doc/man/man1/mwm.1.mwmrc_dir 2002-01-05 16:21:11.000000000 +0100
|
|
|
2b35d3 |
+++ openmotif-2.3.3/doc/man/man1/mwm.1 2010-03-23 13:37:03.000000000 +0100
|
|
|
2b35d3 |
@@ -678,8 +678,8 @@ is set, \fBmwm\fP looks for \fI$HOME/$LA
|
|
|
2b35d3 |
\fB$HOME\fP/\fBconfigFile\fP\&. If the \fIconfigFile\fP pathname does not begin with "~/" or "/", \fBmwm\fP considers it to be relative to the current working directory\&. If
|
|
|
2b35d3 |
the \fIconfigFile\fP resource is not specified
|
|
|
2b35d3 |
or if that file does not exist, \fBmwm\fP uses several default
|
|
|
2b35d3 |
-paths to find a configuration file\&. The order of the search is shown below: \fB/usr/X11R6/lib/X11/$LANG/system\&.mwmrc\fP\(dg
|
|
|
2b35d3 |
-\fB/usr/X11R6/lib/X11/system\&.mwmrc\fP\(dg Paths marked with \&'\(dg\&' are
|
|
|
2b35d3 |
+paths to find a configuration file\&. The order of the search is shown below: \fB/etc/X11/mwm/$LANG/system\&.mwmrc\fP\(dg
|
|
|
2b35d3 |
+\fB/etc/X11/mwm/system\&.mwmrc\fP\(dg Paths marked with \&'\(dg\&' are
|
|
|
2b35d3 |
implementation dependent\&.
|
|
|
2b35d3 |
.IP "\fIdeiconifyKeyFocus\fP\ (class\ \fIDeiconifyKeyFocus\fP)" 10
|
|
|
2b35d3 |
This resource applies only when the keyboard input focus policy is explicit\&.
|
|
|
2b35d3 |
@@ -1344,9 +1344,9 @@ the shell to use when executing commands
|
|
|
2b35d3 |
function\&.
|
|
|
2b35d3 |
.SS "Files"
|
|
|
2b35d3 |
.PP
|
|
|
2b35d3 |
-\fB/usr/X11R6/lib/X11/$LANG/system\&.mwmrc\fP
|
|
|
2b35d3 |
+\fB/etc/X11/mwm/$LANG/system\&.mwmrc\fP
|
|
|
2b35d3 |
.PP
|
|
|
2b35d3 |
-\fB/usr/X11R6/lib/X11/system\&.mwmrc\fP
|
|
|
2b35d3 |
+\fB/etc/X11/mwm/system\&.mwmrc\fP
|
|
|
2b35d3 |
.PP
|
|
|
2b35d3 |
\fB/usr/X11R6/lib/X11/app-defaults/Mwm\fP
|
|
|
2b35d3 |
.PP
|
|
|
2b35d3 |
diff -up openmotif-2.3.3/doc/man/man4/mwmrc.4.mwmrc_dir openmotif-2.3.3/doc/man/man4/mwmrc.4
|
|
|
2b35d3 |
--- openmotif-2.3.3/doc/man/man4/mwmrc.4.mwmrc_dir 2002-01-05 16:21:12.000000000 +0100
|
|
|
2b35d3 |
+++ openmotif-2.3.3/doc/man/man4/mwmrc.4 2010-03-23 13:37:03.000000000 +0100
|
|
|
2b35d3 |
@@ -57,7 +57,7 @@ file that controls much of the behavior
|
|
|
2b35d3 |
It contains descriptions of resources that cannot easily be
|
|
|
2b35d3 |
written using standard X Window System, Version 11 resource syntax\&. The resource
|
|
|
2b35d3 |
description file contains entries that are referred to by X resources in
|
|
|
2b35d3 |
-defaults files (for example, \fB/usr/X11R6/lib/X11/app-defaults/Mwm\fP)
|
|
|
2b35d3 |
+defaults files (for example, \fB/usr/share/X11/app-defaults/Mwm\fP)
|
|
|
2b35d3 |
or in the \fBRESOURCE_MANAGER\fP property on the
|
|
|
2b35d3 |
root window\&. For example, the resource description file enables you to specify
|
|
|
2b35d3 |
different types of window menus; however, an X resource is used to specify
|
|
|
2b35d3 |
@@ -72,8 +72,8 @@ on a per-user basis:
|
|
|
2b35d3 |
.nf
|
|
|
2b35d3 |
\f(CW$HOME/$LANG/\&.mwmrc
|
|
|
2b35d3 |
$HOME/\&.mwmrc
|
|
|
2b35d3 |
-/usr/X11R6/lib/X11/$LANG/system\&.mwmrc
|
|
|
2b35d3 |
-/usr/X11R6/lib/X11/system\&.mwmrc\fR
|
|
|
2b35d3 |
+/etc/X11/mwm/$LANG/system\&.mwmrc
|
|
|
2b35d3 |
+/etc/X11/mwm/system\&.mwmrc\fR
|
|
|
2b35d3 |
.fi
|
|
|
2b35d3 |
.PP
|
|
|
2b35d3 |
.PP
|
|
|
2b35d3 |
@@ -84,7 +84,7 @@ resource\&. The following shows how a di
|
|
|
2b35d3 |
be specified from the command line:
|
|
|
2b35d3 |
.PP
|
|
|
2b35d3 |
.nf
|
|
|
2b35d3 |
-\f(CW/usr/X11R6/bin/X11/mwm -xrm "mwm*configFile: mymwmrc"\fR
|
|
|
2b35d3 |
+\f(CW/usr/bin/mwm -xrm "mwm*configFile: mymwmrc"\fR
|
|
|
2b35d3 |
.fi
|
|
|
2b35d3 |
.PP
|
|
|
2b35d3 |
.SS "Resource Types"
|
|
|
2b35d3 |
@@ -626,8 +626,8 @@ is not what you expect\&.
|
|
|
2b35d3 |
.nf
|
|
|
2b35d3 |
\fB$HOME/$LANG/\&.mwmrc
|
|
|
2b35d3 |
$HOME/\&.mwmrc
|
|
|
2b35d3 |
-/usr/X11R6/lib/X11/$LANG/system\&.mwmrc
|
|
|
2b35d3 |
-/usr/X11R6/lib/X11/system\&.mwmrc\fP
|
|
|
2b35d3 |
+/etc/X11/mwm/$LANG/system\&.mwmrc
|
|
|
2b35d3 |
+/etc/X11/mwm/system\&.mwmrc\fP
|
|
|
2b35d3 |
.fi
|
|
|
2b35d3 |
.SH "RELATED INFORMATION"
|
|
|
2b35d3 |
.PP
|