Remove default defines of some directories.
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@anholt.net> Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
da27ca84b4
commit
5ef4e78513
|
@ -24,7 +24,6 @@ libxf86config_la_SOURCES = \
|
|||
$(INTERNAL_SOURCES)
|
||||
|
||||
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \
|
||||
-DSYSCONFDIR=\"$(sysconfdir)\" \
|
||||
-DDATADIR=\"$(datadir)\"
|
||||
|
||||
EXTRA_DIST = \
|
||||
|
|
|
@ -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"
|
||||
#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); \
|
||||
|
|
|
@ -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\""
|
||||
|
|
Loading…
Reference in New Issue