Blame SOURCES/motif-2.3.4-mwmrc_dir.patch

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