--- Makefile.am.orig	2011-05-03 11:23:57.000000000 +0000

+++ Makefile.am	2011-05-03 11:27:49.216345954 +0000

@@ -21,12 +21,12 @@

 # rstartd server

-rstart_serverdir = $(libdir)/X11/rstart

+rstart_serverdir = $(bindir)

 rstart_server_PROGRAMS = rstartd.real

 AM_CFLAGS = $(CWARNFLAGS) $(RSTART_CFLAGS)		\

 		-DSERVERNAME=\"rstart\"			\

-		-DDEFAULT_CONFIG=\"$(libdir)/X11/rstart/config\"

+		-DDEFAULT_CONFIG=\"$(sysconfdir)/X11/rstart/config\"

 rstartd_real_LDADD = $(RSTART_LIBS)

@@ -51,7 +51,7 @@

 # config data

-configdir = $(libdir)/X11/rstart

+configdir = $(sysconfdir)/X11/rstart

 config_DATA = config

 config: config.cpp

@@ -102,7 +102,7 @@

 # FIXME: Someone who cares about rstart may want to look into sanitizing

 # the stuff below.

-DATA_DIR = $(libdir)/X11/rstart

+DATA_DIR = $(sysconfdir)/X11/rstart

 install-data-hook:

 	(cd ${srcdir};							\