diff options
| author | Egbert Eich <eich@freedesktop.org> | 2012-11-30 06:49:10 -0500 |
|---|---|---|
| committer | Egbert Eich <eich@freedesktop.org> | 2013-01-04 05:42:11 -0500 |
| commit | 261f9ddab794742c07e28c93f8d5bbbf992676bd (patch) | |
| tree | 50a6a3460a1ba4a0ef92ddd47a3b1e3a8c70fc5c | |
| parent | b1e14dadd77e69be6cb1e9223015cd43497b554a (diff) | |
install: Use sysconfdir instead of libdir for config files.
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@freedesktop.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | 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) |