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.
Signed-off-by: Eric Anholt <e...@anholt.net>
---
hw/xfree86/parser/Makefile.am | 1 -
hw/xfree86/parser/scan.c | 15 ---------------
xkb/ddxLoad.c | 12 ------------
3 files changed, 28 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..64a6274634ea 100644
--- a/hw/xfree86/parser/scan.c
+++ b/hw/xfree86/parser/scan.c
@@ -542,24 +542,9 @@ 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
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\""
--
2.11.0
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
