[PATCH xserver 2/2] Remove default defines of some directories.

[walter harms]

Am 24.04.2017 22:19, schrieb Eric Anholt:
> The build defines these, so having the defaults is just a way for the
> build system's configuration to get out of sync with the code.
> 
> v2: Drop #ifndefs around the other two defines.
> 
> Signed-off-by: Eric Anholt <eric at anholt.net>
> ---
>  hw/xfree86/parser/Makefile.am |  1 -
>  hw/xfree86/parser/scan.c      | 19 -------------------
>  xkb/ddxLoad.c                 | 12 ------------
>  3 files changed, 32 deletions(-)
> 
> diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
> index 9aa8cfefbd2b..2e4c6afdb21e 100644
> --- a/hw/xfree86/parser/Makefile.am
> +++ b/hw/xfree86/parser/Makefile.am
> @@ -24,7 +24,6 @@ libxf86config_la_SOURCES = \
>  	$(INTERNAL_SOURCES)
>  
>  AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \
> -	-DSYSCONFDIR=\"$(sysconfdir)\" \
>  	-DDATADIR=\"$(datadir)\"
>  
>  EXTRA_DIST = \
> diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c
> index 3356224ce061..bac213a73ab9 100644
> --- a/hw/xfree86/parser/scan.c
> +++ b/hw/xfree86/parser/scan.c
> @@ -542,27 +542,8 @@ xf86pathIsSafe(const char *path)
>   *    %%    %
>   */
>  
> -#ifndef XCONFIGFILE
> -#define XCONFIGFILE	"xorg.conf"
> -#endif
> -#ifndef XCONFIGDIR
> -#define XCONFIGDIR	"xorg.conf.d"
> -#endif
> -#ifndef XCONFIGSUFFIX
>  #define XCONFIGSUFFIX	".conf"

while we are here ...
this pattern seems to be used to filter inside XCONFIGDIR for *.conf.
why not set this to "" or even better drop it all together ?

re,
 wh

> -#endif
> -#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
>  
>  #define BAIL_OUT		do {									\
>  							free(result);				\
> diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
> index f71815aa814b..a1a0fd3a28be 100644
> --- a/xkb/ddxLoad.c
> +++ b/xkb/ddxLoad.c
> @@ -45,18 +45,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
>  #include <X11/extensions/XI.h>
>  #include "xkb.h"
>  
> -        /*
> -         * If XKM_OUTPUT_DIR specifies a path without a leading slash, it is
> -         * relative to the top-level XKB configuration directory.
> -         * Making the server write to a subdirectory of that directory
> -         * requires some work in the general case (install procedure
> -         * has to create links to /var or somesuch on many machines),
> -         * so we just compile into /usr/tmp for now.
> -         */
> -#ifndef XKM_OUTPUT_DIR
> -#define	XKM_OUTPUT_DIR	"compiled/"
> -#endif
> -
>  #define	PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\""
>  #define	ERROR_PREFIX	"\"> \""
>  #define	POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\""