diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-08 17:55:19 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-08 17:55:19 +0000 |
| commit | 008c2dd5e4614e6a21123ee3a2ac9c5d3bafa97a (patch) | |
| tree | 82a717f827012e7cd4df7e3e49a7888c35a64849 /hw/xfree86/utils | |
| parent | 39189c2b86a4c2ab5f3f161d423eb072356668e5 (diff) | |
Add configure options to allow hard-coded paths to be changed.
Diffstat (limited to 'hw/xfree86/utils')
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/Makefile.am | 7 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgconfig/Makefile.am | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/hw/xfree86/utils/xorgcfg/Makefile.am b/hw/xfree86/utils/xorgcfg/Makefile.am index 2bc812a49..d2933eeff 100644 --- a/hw/xfree86/utils/xorgcfg/Makefile.am +++ b/hw/xfree86/utils/xorgcfg/Makefile.am @@ -31,8 +31,11 @@ bin_PROGRAMS = xorgcfg INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser +OPTIONSPATH=$(libdir)/X11 + xorgcfg_CFLAGS = @SERVER_DEFINES@ $(XORG_CFLAGS) $(CURSESDEFINES) \ - $(XORGCFG_DEP_CFLAGS) + $(XORGCFG_DEP_CFLAGS) -DXKB_RULES_DIR=\"$(XKB_BASE_DIRECTORY)/rules\" \ + -DPROJECT_ROOT=\"$(PROJECTROOT)\" -DOPTIONSPATH=\"$(OPTIONSPATH)\" xorgcfg_LDADD = $(XORGCFG_DEP_LIBS) ../../parser/libxf86config.a $(LOADERLIB) \ ../../os-support/libxorgos.la ../../dummylib/libdummy-nonserver.a @@ -120,7 +123,7 @@ include $(top_srcdir)/cpprules.in # App default files (*.ad) -appdefaultdir = @appdefaultdir@ +appdefaultdir = @APPDEFAULTDIR@ APPDEFAULTFILES = XOrgCfg diff --git a/hw/xfree86/utils/xorgconfig/Makefile.am b/hw/xfree86/utils/xorgconfig/Makefile.am index 4f3d62049..ec0b01fe1 100644 --- a/hw/xfree86/utils/xorgconfig/Makefile.am +++ b/hw/xfree86/utils/xorgconfig/Makefile.am @@ -33,7 +33,7 @@ dist_X11_DATA = Cards xorgconfig_CFLAGS = @SERVER_DEFINES@ @XORGCONFIG_DEP_CFLAGS@ \ -DCARD_DATABASE_FILE='"$(X11dir)/Cards"' \ - -DPROJECTROOT='"$(prefix)"' \ + -DPROJECTROOT='"$(PROJECTROOT)"' \ -DFILEMANSUFFIX='"$(FILE_MAN_SUFFIX)"' \ -DXVERSIONSTRING='"$(PACKAGE_STRING)"' |