Install configuration in /etc/X11

This commit is contained in:
matthieu 2006-11-29 12:17:58 +00:00
parent eb500fcb15
commit ed50e38125
4 changed files with 12 additions and 8 deletions

View File

@ -22,7 +22,7 @@
bin_PROGRAMS = lbxproxy bin_PROGRAMS = lbxproxy
lbxproxy_CFLAGS = $(LBXPROXY_CFLAGS) -I$(top_srcdir)/include \ lbxproxy_CFLAGS = $(LBXPROXY_CFLAGS) -I$(top_srcdir)/include \
-DDEF_ATOMS_FILE=\"$(libdir)/X11/lbxproxy/AtomControl\" \ -DDEF_ATOMS_FILE=\"$(datadir)/X11/lbxproxy/AtomControl\" \
-D_BSD_SOURCE -DLBXPROXY_t -DTRANS_SERVER -D_BSD_SOURCE -DLBXPROXY_t -DTRANS_SERVER
lbxproxy_LDADD = $(LBXPROXY_LIBS) lbxproxy_LDADD = $(LBXPROXY_LIBS)
@ -81,7 +81,7 @@ lbxproxy_SOURCES = \
appman_PRE = \ appman_PRE = \
lbxproxy.man lbxproxy.man
configdir = $(libdir)/X11/lbxproxy configdir = $(datadir)/X11/lbxproxy
dist_config_DATA = config/AtomControl dist_config_DATA = config/AtomControl
EXTRA_DIST = \ EXTRA_DIST = \

View File

@ -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:21:29 matthieu Exp $
CONFIGURE_ARGS= --datadir=/etc
.include <bsd.xorg.mk> .include <bsd.xorg.mk>

View File

@ -21,12 +21,12 @@
# rstartd server # rstartd server
rstart_serverdir = $(libdir)/X11/rstart rstart_serverdir = $(datadir)/X11/rstart
rstart_server_PROGRAMS = rstartd.real rstart_server_PROGRAMS = rstartd.real
rstartd_real_CFLAGS = $(RSTART_CFLAGS) \ rstartd_real_CFLAGS = $(RSTART_CFLAGS) \
-DSERVERNAME=\"rstart\" \ -DSERVERNAME=\"rstart\" \
-DDEFAULT_CONFIG=\"$(libdir)/X11/rstart/config\" -DDEFAULT_CONFIG=\"$(rstart_serverdir)/config\"
rstartd_real_LDADD = $(RSTART_LIBS) rstartd_real_LDADD = $(RSTART_LIBS)
@ -50,7 +50,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
# config data # config data
configdir = $(libdir)/X11/rstart configdir = $(datadir)/X11/rstart
config_DATA = config config_DATA = config
config: config.cpp 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 # FIXME: Someone who cares about rstart may want to look into sanitizing
# the stuff below. # the stuff below.
DATA_DIR = $(libdir)/X11/rstart DATA_DIR = $(datadir)/X11/rstart
install-data-hook: install-data-hook:
for name in `find ${srcdir}/commands -print | grep -v CVS` ; do \ for name in `find ${srcdir}/commands -print | grep -v CVS` ; do \

View File

@ -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> .include <bsd.xorg.mk>