[PATCH rstart] install: Use sysconfdir instead of libdir for config files.
Egbert Eich
eich at freedesktop.org
Thu Jan 3 10:44:34 PST 2013
Most X packages today install their config files in sysconfigdir,
only a few are left which still put their configuration in libdir.
Fix and consolidate setting of the config dir in one place.
Signed-off-by: Egbert Eich <eich at freedesktop.org>
---
Makefile.am | 2 +-
configure.ac | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 35c3789..d50a367 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ rstart_PROGRAMS = rstartd.real
AM_CFLAGS = \
$(CWARNFLAGS) $(RSTART_CFLAGS) \
-DSERVERNAME=\"rstart\" \
- -DDEFAULT_CONFIG=\"$(rstartdir)/config\"
+ -DDEFAULT_CONFIG=\"$(configdir)/config\"
rstartd_real_SOURCES = \
auth.c \
diff --git a/configure.ac b/configure.ac
index bdf67da..46839c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,9 +43,12 @@ XORG_DEFAULT_OPTIONS
AC_CHECK_PROGS(RSH,[remsh rsh rcmd])
AC_PROG_LN_S
-# Define the root directory for client/server/config
+# Define the root directory for client/server
AC_SUBST([rstartdir],[$libdir/X11/rstart])
+# Define the root directory for config
+AC_SUBST([configdir],[$(sysconfdir)/X11/rstart])
+
# Obtain compiler options from depedencies
PKG_CHECK_MODULES(RSTART, xproto)
--
1.7.7
More information about the xorg-devel
mailing list