[5404] in Moira
Re: DESTDIR support for Moira and moira.conf installation
daemon@ATHENA.MIT.EDU (Evan Broder)
Mon Jan 5 17:14:24 2009
Message-ID: <49628612.9010702@mit.edu>
Date: Mon, 05 Jan 2009 17:13:38 -0500
From: Evan Broder <broder@MIT.EDU>
MIME-Version: 1.0
To: Garry Zacheiss <zacheiss@mit.edu>
CC: moiradev@mit.edu
In-Reply-To: <200901051651.n05GpZku027977@brad-majors.mit.edu>
Content-Type: multipart/mixed;
boundary="------------010402050606040500060501"
This is a multi-part message in MIME format.
--------------010402050606040500060501
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Here's a new patch that uses mkinstalldirs.
Thanks,
- Evan
Garry Zacheiss wrote:
> I'll take the DESTDIR support.
>
> The patch to install moira.conf assumes an install that supports -D,
> which I can't assume on Solaris; I'll take it if you rewrite it to use
> mkinstalldirs or install -d.
>
> Garry
>
--------------010402050606040500060501
Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0";
name="install-moira-conf.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="install-moira-conf.patch"
diff -u update/Makefile.in update/Makefile.in
--- update/Makefile.in 4 Jan 2009 05:48:52 -0000
+++ update/Makefile.in 5 Jan 2009 22:08:43 -0000
@@ -22,6 +22,7 @@
exec_prefix=@exec_prefix@
bindir=@bindir@
sbindir=@sbindir@
+sysconfdir=@sysconfdir@
SOBJS= auth_002.o auth_003.o checksum.o config.o exec_002.o get_file.o \
update_server.o xfer_002.o xfer_003.o sendrecv.o
@@ -45,6 +46,8 @@
install: all
$(INSTALL_PROGRAM) update_test $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) update_server $(DESTDIR)$(sbindir)
+ $(SRCTOP)/mkinstalldirs $(DESTDIR)$(sysconfdir)/athena
+ $(INSTALL) -m 644 moira.conf $(DESTDIR)$(sysconfdir)/athena/moira.conf
update_test: $(COBJS) $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(COBJS) $(LIBS)
--------------010402050606040500060501--
