Index: Makefile.in
===================================================================
--- Makefile.in (revision 7274)
+++ Makefile.in (working copy)
@@ -18,6 +18,7 @@
 sysconfdir     = @sysconfdir@
 libdir         = @libdir@
 sbindir                = @sbindir@
+localstatedir=@localstatedir@
 DOCDIR         = @DOCDIR@
 MODDIR         = @MODDIR@
 SHAREDIR       = @SHAREDIR@
Index: src/Makefile.in
===================================================================
--- src/Makefile.in     (revision 7274)
+++ src/Makefile.in     (working copy)
@@ -18,6 +18,7 @@
 sysconfdir     = @sysconfdir@
 libdir         = @libdir@
 sbindir                = @sbindir@
+localstatedir=@localstatedir@
 DOCDIR         = @DOCDIR@
 MODDIR         = @MODDIR@
 SHAREDIR       = @SHAREDIR@
@@ -101,16 +102,16 @@

 install: build
        $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)
-       $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/bin
-       $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/etc
-       $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/var
+       $(INSTALL) -m 755 -d $(DESTDIR)$(sbindir)
+       $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)
+       $(INSTALL) -m 755 -d $(DESTDIR)$(localstatedir)
        $(INSTALL) -m 755 -d $(DESTDIR)$(DOCDIR)
        $(INSTALL) -m 755 -d $(DESTDIR)$(SHAREDIR)/help
-       $(INSTALL) -m 755 -c $(BIN) $(DESTDIR)$(prefix)/bin
-       $(INSTALL) -m 640 -c ../dist/example.conf $(DESTDIR)$(prefix)/etc
-       $(INSTALL) -m 640 -c ../dist/example.motd $(DESTDIR)$(prefix)/etc
-       $(INSTALL) -m 640 -c ../dist/example.userserv.conf $(DESTDIR)$(prefix)/etc
-       $(INSTALL) -m 640 -c ../dist/atheme.chk $(DESTDIR)$(prefix)/etc/atheme.chk.sample
+       $(INSTALL) -m 755 -c $(BIN) $(DESTDIR)$(sbindir)
+       $(INSTALL) -m 640 -c ../dist/example.conf $(DESTDIR)$(sysconfdir)
+       $(INSTALL) -m 640 -c ../dist/example.motd $(DESTDIR)$(sysconfdir)
+       $(INSTALL) -m 640 -c ../dist/example.userserv.conf $(DESTDIR)$(sysconfdir)
+       $(INSTALL) -m 640 -c ../dist/atheme.chk $(DESTDIR)$(DOCDIR)/atheme.chk.sample
        (cd ../doc; for i in *; do $(INSTALL) -m 644 $$i $(DESTDIR)$(DOCDIR); done)
        (cd ../help; for i in *; do \
                [ -f $$i ] && $(INSTALL) -m 644 $$i $(DESTDIR)$(SHAREDIR)/help; \
Index: configure.ac
===================================================================
--- configure.ac        (revision 7274)
+++ configure.ac        (working copy)
@@ -157,6 +157,7 @@
   case "$enableval" in
   yes)
     FHSPATHS="yes"
+    SYSCONFDIR='${sysconfdir}'
     DOCDIR='${datadir}/doc/atheme'
     MODDIR='${libdir}/atheme'
     SHAREDIR='${datadir}/atheme'
@@ -541,7 +542,7 @@
 LDFLAGS=${ac_save_LDFLAGS}
 ])

-ac_save_CFLAGS="${CFLAGS} ${orig_CFLAGS} ${CWARNS} -DPREFIX=\\\"\${prefix}\\\" -DMODDIR=\\\"\${MODDIR}\\\" -DSHAREDIR=\\\"${SHAREDIR}\\\""
+ac_save_CFLAGS="${CFLAGS} ${orig_CFLAGS} ${CWARNS} -DPREFIX=\\\"\${prefix}\\\" -DMODDIR=\\\"\${MODDIR}\\\" -DSHAREDIR=\\\"${SHAREDIR}\\\" -DSYSCONFDIR=\\\"${sysconfdir}\\\" -DLOCALESTATEDIR=\\\"${localstatedir}\\\""
 CFLAGS=${ac_save_CFLAGS}
 dnl export CFLAGS