Add configure options to allow hard-coded paths to be changed.
This commit is contained in:
parent
39189c2b86
commit
008c2dd5e4
|
@ -1,3 +1,11 @@
|
|||
2005-12-08 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
|
||||
* configure.ac:
|
||||
* hw/xfree86/Makefile.am:
|
||||
* hw/xfree86/utils/xorgcfg/Makefile.am:
|
||||
* hw/xfree86/utils/xorgconfig/Makefile.am:
|
||||
Add configure options to allow hard-coded paths to be changed.
|
||||
|
||||
2005-12-07 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
|
||||
* configure.ac:
|
||||
|
|
|
@ -1291,8 +1291,8 @@ if test x$XORGCFG = xyes ; then
|
|||
AC_SUBST(XORGCFG_DEP_CFLAGS)
|
||||
AC_SUBST(XORGCFG_DEP_LIBS)
|
||||
|
||||
appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
|
||||
AC_SUBST(appdefaultdir)
|
||||
APPDEFAULTDIR=$(pkg-config --variable=appdefaultdir xt)
|
||||
AC_SUBST(APPDEFAULTDIR)
|
||||
fi
|
||||
AM_CONDITIONAL(BUILD_XORGCFG, [test x$XORGCFG = xyes])
|
||||
AM_CONDITIONAL(USE_CURSES, [test x$CURSES = xyes])
|
||||
|
|
|
@ -72,4 +72,7 @@ if INSTALL_SETUID
|
|||
chmod u+s $(DESTDIR)$(bindir)/Xorg
|
||||
endif
|
||||
|
||||
EXTRA_DIST = xorgconf.cpp Options
|
||||
optionsdir = $(libdir)/X11
|
||||
dist_options_DATA = Options
|
||||
|
||||
EXTRA_DIST = xorgconf.cpp
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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)"'
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user