[1806] in Moira Commits
/svn/moira r3950 - trunk/moira/update
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Mon Jan 4 17:02:27 2010
Date: Mon, 4 Jan 2010 17:02:24 -0500
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201001042202.o04M2OlX019485@drugstore.mit.edu>
To: moira-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2010-01-04 17:02:24 -0500 (Mon, 04 Jan 2010)
New Revision: 3950
Modified:
trunk/moira/update/Makefile.in
trunk/moira/update/config.c
Log:
Install and look for moira.conf in sysconfdir, wherever that happens to be.
Modified: trunk/moira/update/Makefile.in
===================================================================
--- trunk/moira/update/Makefile.in 2010-01-04 18:13:12 UTC (rev 3949)
+++ trunk/moira/update/Makefile.in 2010-01-04 22:02:24 UTC (rev 3950)
@@ -4,7 +4,7 @@
@SET_MAKE@
CC=@CC@
-CPPFLAGS=@CPPFLAGS@
+CPPFLAGS=@CPPFLAGS@ -DCONFIG_FILE=\"$(sysconfdir)/moira.conf\"
CFLAGS=@CFLAGS@
DEFS=@DEFS@
ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS)
@@ -50,8 +50,8 @@
install: all
$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) update_test $(DESTDIR)$(bindir)
$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) update_server $(DESTDIR)$(sbindir)
- $(SRCTOP)/mkinstalldirs $(DESTDIR)/etc/athena
- $(INSTALL) -m 644 moira.conf $(DESTDIR)/etc/athena/moira.conf
+ $(SRCTOP)/mkinstalldirs $(DESTDIR)$(sysconfdir)
+ $(INSTALL) -m 644 moira.conf $(DESTDIR)$(sysconfdir)/moira.conf
update_test: $(COBJS) $(MR_LIBDEP)
$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(COBJS) $(LIBS)
Modified: trunk/moira/update/config.c
===================================================================
--- trunk/moira/update/config.c 2010-01-04 18:13:12 UTC (rev 3949)
+++ trunk/moira/update/config.c 2010-01-04 22:02:24 UTC (rev 3950)
@@ -26,8 +26,6 @@
RCSID("$Header: /afs/.athena.mit.edu/astaff/project/moiradev/repository/moira/update/config.c,v 1.7 1998-02-15 17:49:27 danw Exp $");
-#define CONFIG_FILE "/etc/athena/moira.conf"
-
/* Variables currently supported:
* chroot directory daemon will run chrooted to this directory
* user username daemon will run with this user's uid
