diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2010-02-01 17:11:54 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2010-02-05 19:14:52 +0000 |
| commit | 11252ed82e1f361b99e86521ac9314f868bd1a3a (patch) | |
| tree | b354f2114db3ea90edd858315b00ca85ba68e814 | |
| parent | 34269a90ea2087f883f5dc8805894fc4998e4b81 (diff) | |
Cygwin/X: Look for system.Xwinrc in SYSCONFDIR/X11
Look for system.Xwinrc in SYSCONFDIR/X11 (usually /etc/X11)
Rename sample system.Xwinrc file not to have a X11R6 path in it's name
Add makefile install rule for system.XWinrc
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | hw/xwin/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/xwin/system.XWinrc (renamed from hw/xwin/_usr_X11R6_lib_X11_system.XWinrc) | 2 | ||||
| -rw-r--r-- | hw/xwin/winprefs.c | 4 | ||||
| -rw-r--r-- | include/xwin-config.h.in | 4 |
5 files changed, 11 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 2546e8352..ef441dad3 100644 --- a/configure.ac +++ b/configure.ac @@ -1825,6 +1825,7 @@ AC_MSG_RESULT([$XWIN]) if test "x$XWIN" = xyes; then PKG_CHECK_EXISTS($WINDOWSWMPROTO, [WINDOWSWM=yes], [WINDOWSWM=no]) + AC_DEFINE_DIR(SYSCONFDIR, sysconfdir, [Location of system.XWinrc]) AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support]) AC_CHECK_TOOL(WINDRES, windres) diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am index 3324157c7..8b1897235 100644 --- a/hw/xwin/Makefile.am +++ b/hw/xwin/Makefile.am @@ -190,12 +190,14 @@ XWinrc.$(FILE_MAN_SUFFIX): XWinrc.man EXTRAMANDEFS = -D__logdir__=$(logdir) -D__sysconfdir__=$(sysconfdir) -D__datadir__=$(datadir) +xwinconfigdir = $(sysconfdir)/X11 +xwinconfig_DATA = system.XWinrc + include $(top_srcdir)/cpprules.in EXTRA_DIST = \ $(GLX_EXTRAS) \ $(MAN_SRCS) \ - _usr_X11R6_lib_X11_system.XWinrc \ X.ico \ XWin.rc \ xlaunch/config.cc \ diff --git a/hw/xwin/_usr_X11R6_lib_X11_system.XWinrc b/hw/xwin/system.XWinrc index 1de6e2ab0..37ac00859 100644 --- a/hw/xwin/_usr_X11R6_lib_X11_system.XWinrc +++ b/hw/xwin/system.XWinrc @@ -1,7 +1,7 @@ # XWin Server Resource File - EXAMPLE # Earle F. Philhower, III -# Place in ~/.XWinrc or in /usr/X11R6/lib/X11/system.XWinrc +# Place in ~/.XWinrc or in /etc/X11/system.XWinrc # Keywords are case insensitive, comments legal pretty much anywhere # you can have an end-of-line diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c index d5bceb928..93901cac7 100644 --- a/hw/xwin/winprefs.c +++ b/hw/xwin/winprefs.c @@ -723,7 +723,7 @@ winIconIsOverride(unsigned hiconIn) /* - * Try and open ~/.XWinrc and /usr/X11R6/lib/X11/system.XWinrc + * Try and open ~/.XWinrc and system.XWinrc * Load it into prefs structure for use by other functions */ void @@ -763,7 +763,7 @@ LoadPreferences (void) #ifdef RELOCATE_PROJECTROOT snprintf(buffer, sizeof(buffer), "%s\\system.XWinrc", winGetBaseDir()); #else - strncpy(buffer, PROJECTROOT"/lib/X11/system.XWinrc", sizeof(buffer)); + strncpy(buffer, SYSCONFDIR"/X11/system.XWinrc", sizeof(buffer)); #endif buffer[sizeof(buffer)-1] = 0; prefFile = fopen (buffer, "r"); diff --git a/include/xwin-config.h.in b/include/xwin-config.h.in index 932f2e861..21ceb29cf 100644 --- a/include/xwin-config.h.in +++ b/include/xwin-config.h.in @@ -28,3 +28,7 @@ /* Vendor web address for support */ #undef __VENDORDWEBSUPPORT__ + +/* Location of system.XWinrc */ +#undef SYSCONFDIR + |