diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-11-29 12:17:59 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-11-29 12:17:59 +0000 |
| commit | 76892da270747fdab3b9da6f9e34cc07170adb05 (patch) | |
| tree | 15ff3385fa8739dad44ac76b4efc6f142249a102 | |
| parent | 66a069b6aebba5902ca8e7c764496c6785aa1256 (diff) | |
Install configuration in /etc/X11
| -rw-r--r-- | app/rstart/Makefile.am | 8 | ||||
| -rw-r--r-- | app/rstart/Makefile.bsd-wrapper | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/rstart/Makefile.am b/app/rstart/Makefile.am index b27ac491d..7ded5fe64 100644 --- a/app/rstart/Makefile.am +++ b/app/rstart/Makefile.am @@ -21,12 +21,12 @@ # rstartd server -rstart_serverdir = $(libdir)/X11/rstart +rstart_serverdir = $(datadir)/X11/rstart rstart_server_PROGRAMS = rstartd.real rstartd_real_CFLAGS = $(RSTART_CFLAGS) \ -DSERVERNAME=\"rstart\" \ - -DDEFAULT_CONFIG=\"$(libdir)/X11/rstart/config\" + -DDEFAULT_CONFIG=\"$(rstart_serverdir)/config\" rstartd_real_LDADD = $(RSTART_LIBS) @@ -50,7 +50,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ # config data -configdir = $(libdir)/X11/rstart +configdir = $(datadir)/X11/rstart config_DATA = config config: config.cpp @@ -99,7 +99,7 @@ CLEANFILES = rstart rstartd config $(appman_DATA) # FIXME: Someone who cares about rstart may want to look into sanitizing # the stuff below. -DATA_DIR = $(libdir)/X11/rstart +DATA_DIR = $(datadir)/X11/rstart install-data-hook: for name in `find ${srcdir}/commands -print | grep -v CVS` ; do \ diff --git a/app/rstart/Makefile.bsd-wrapper b/app/rstart/Makefile.bsd-wrapper index 136b2e6a7..634798cde 100644 --- a/app/rstart/Makefile.bsd-wrapper +++ b/app/rstart/Makefile.bsd-wrapper @@ -1,3 +1,5 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:27:26 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2006/11/29 12:17:58 matthieu Exp $ + +CONFIGURE_ARGS= --datadir=/etc .include <bsd.xorg.mk> |