diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-16 15:34:33 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-16 15:34:33 +0000 |
| commit | 0b8629ada4293370d220bbb7e6c195c711baee7d (patch) | |
| tree | a7774b45662db90282ae18b17eb3d8f77d8c746d /xorg-server/hw/xfree86/parser | |
| parent | 8654ee514b4d79feec936501717a06892090d3b7 (diff) | |
| download | vcxsrv-0b8629ada4293370d220bbb7e6c195c711baee7d.tar.gz vcxsrv-0b8629ada4293370d220bbb7e6c195c711baee7d.tar.bz2 vcxsrv-0b8629ada4293370d220bbb7e6c195c711baee7d.zip | |
svn merge -r534:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/parser')
| -rw-r--r-- | xorg-server/hw/xfree86/parser/Makefile.am | 4 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/parser/scan.c | 14 |
2 files changed, 17 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/parser/Makefile.am b/xorg-server/hw/xfree86/parser/Makefile.am index 49c191f2a..caf7079d4 100644 --- a/xorg-server/hw/xfree86/parser/Makefile.am +++ b/xorg-server/hw/xfree86/parser/Makefile.am @@ -34,7 +34,9 @@ libxf86config_a_SOURCES = \ $(INTERNAL_SOURCES) libxf86config_a_CFLAGS = $(AM_CFLAGS) -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DDATADIR=\"$(datadir)\" EXTRA_DIST = \ Configint.h \ diff --git a/xorg-server/hw/xfree86/parser/scan.c b/xorg-server/hw/xfree86/parser/scan.c index cdca9ca1c..8aab0cf41 100644 --- a/xorg-server/hw/xfree86/parser/scan.c +++ b/xorg-server/hw/xfree86/parser/scan.c @@ -599,6 +599,8 @@ xf86pathIsSafe(const char *path) * %F config file environment ($XORGCONFIG) as a relative path * %G config file environment ($XORGCONFIG) as a safe path * %P projroot + * %C sysconfdir + * %D datadir * %M major version number * %% % */ @@ -615,6 +617,12 @@ xf86pathIsSafe(const char *path) #ifndef PROJECTROOT #define PROJECTROOT "/usr/X11R6" #endif +#ifndef SYSCONFDIR +#define SYSCONFDIR PROJECTROOT "/etc" +#endif +#ifndef DATADIR +#define DATADIR PROJECTROOT "/share" +#endif #ifndef XCONFENV #define XCONFENV "XORGCONFIG" #endif @@ -755,6 +763,12 @@ DoSubstitution(const char *template, const char *cmdline, const char *projroot, else BAIL_OUT; break; + case 'C': + APPEND_STR(SYSCONFDIR); + break; + case 'D': + APPEND_STR(DATADIR); + break; case 'M': if (!majorvers[0]) { if (XF86_VERSION_MAJOR < 0 || XF86_VERSION_MAJOR > 99) { |