[5402] in Moira
DESTDIR support for Moira and moira.conf installation
daemon@ATHENA.MIT.EDU (Evan Broder)
Sun Jan 4 01:25:47 2009
Message-ID: <49605651.80105@mit.edu>
Date: Sun, 04 Jan 2009 01:25:21 -0500
From: Evan Broder <broder@MIT.EDU>
MIME-Version: 1.0
To: moiradev@mit.edu
Content-Type: multipart/mixed;
boundary="------------020509070205070204070204"
This is a multi-part message in MIME format.
--------------020509070205070204070204
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
SIPB Debathena and SIPB MacAthena have been using a patch for some time
to add support for the DESTDIR variable to the Moira Makefiles (see
http://www.gnu.org/prep/standards/html_node/DESTDIR.html). I've expanded
the patch to cover all Makefiles that I see in the CVS repository and
attached it. I'd appreciate seeing this included in CVS so we can
eliminate one more patch we have to apply.
We also are currently patching update/Makefile.in to install the sample
moira.conf file. This doesn't make a lot of sense for building Moira
into a locker, but makes perfect sense if you're building update_server
for a workstation. The patch depends on moira-build-destdir.patch, but
it should apply against the head of the CVS repository if you remove the
3 instances of $(DESTDIR)
Thanks,
- Evan
--------------020509070205070204070204
Content-Type: text/x-diff;
name="moira-build-destdir.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="moira-build-destdir.patch"
Index: Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/Makefile.in,v
retrieving revision 1.11
diff -u -r1.11 Makefile.in
--- Makefile.in 9 Oct 2001 14:33:10 -0000 1.11
+++ Makefile.in 4 Jan 2009 05:48:51 -0000
@@ -35,11 +35,11 @@
@for d in $(SUBDIRS); do (echo "### Making $@ in $$d"; cd $$d; $(MAKE) $@) || exit 1; done
install:
- $(srcdir)/mkinstalldirs $(bindir) $(sbindir) $(mrbindir) $(mandir)
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)
@for d in $(SUBDIRS); do (echo "### Making $@ in $$d"; cd $$d; $(MAKE) $@) || exit 1; done
svrinstall:
- $(srcdir)/mkinstalldirs $(mrbindir)
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(mrbindir)
@for d in $(SVRDIRS); do (echo "### Making install in $$d"; cd $$d; $(MAKE) install) || exit 1; done
world: depend all
Index: afssync/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/afssync/Makefile.in,v
retrieving revision 1.8
diff -u -r1.8 Makefile.in
--- afssync/Makefile.in 25 Sep 2002 20:46:51 -0000 1.8
+++ afssync/Makefile.in 4 Jan 2009 05:59:15 -0000
@@ -56,9 +56,9 @@
depend: $(CFILES)
install:
- $(INSTALL_PROGRAM) afssync $(mrbindir)
- $(INSTALL_PROGRAM) pt_util $(mrbindir)
- $(INSTALL_PROGRAM) $(srcdir)/pt_util.pl $(mrbindir)
+ $(INSTALL_PROGRAM) afssync $(DESTDIR)$(mrbindir)
+ $(INSTALL_PROGRAM) pt_util $(DESTDIR)$(mrbindir)
+ $(INSTALL_PROGRAM) $(srcdir)/pt_util.pl $(DESTDIR)$(mrbindir)
afssync: $(SYNC_OBJS) $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(SYNC_OBJS) $(AFS_LIBS) -llwp -lprot $(SQL_LIBS) $(LIBS)
Index: backup/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/backup/Makefile.in,v
retrieving revision 1.8
diff -u -r1.8 Makefile.in
--- backup/Makefile.in 5 Jun 2000 05:58:37 -0000 1.8
+++ backup/Makefile.in 4 Jan 2009 05:58:58 -0000
@@ -52,9 +52,9 @@
depend: $(GENFILES) $(CFILES)
install:
- $(INSTALL_PROGRAM) mrbackup $(mrbindir)
- $(INSTALL_PROGRAM) mrrestore $(mrbindir)
- $(INSTALL_PROGRAM) $(srcdir)/report.pl $(mrbindir)
+ $(INSTALL_PROGRAM) mrbackup $(DESTDIR)$(mrbindir)
+ $(INSTALL_PROGRAM) mrrestore $(DESTDIR)$(mrbindir)
+ $(INSTALL_PROGRAM) $(srcdir)/report.pl $(DESTDIR)$(mrbindir)
mrbackup: $(BOBJS) $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(BOBJS) $(LIBS)
Index: clients/addusr/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/clients/addusr/Makefile.in,v
retrieving revision 1.6
diff -u -r1.6 Makefile.in
--- clients/addusr/Makefile.in 12 Jul 1999 16:20:42 -0000 1.6
+++ clients/addusr/Makefile.in 4 Jan 2009 05:48:51 -0000
@@ -40,7 +40,7 @@
depend:
install: all
- $(INSTALL_PROGRAM) -m 755 addusr $(bindir)
+ $(INSTALL_PROGRAM) -m 755 addusr $(DESTDIR)$(bindir)
$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
Index: clients/blanche/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/clients/blanche/Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 Makefile.in
--- clients/blanche/Makefile.in 12 Jul 1999 16:20:43 -0000 1.5
+++ clients/blanche/Makefile.in 4 Jan 2009 05:48:51 -0000
@@ -40,7 +40,7 @@
depend:
install: all
- $(INSTALL_PROGRAM) blanche $(bindir)
+ $(INSTALL_PROGRAM) blanche $(DESTDIR)$(bindir)
$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
Index: clients/chfn/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/clients/chfn/Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 Makefile.in
--- clients/chfn/Makefile.in 16 Mar 2000 06:03:09 -0000 1.1
+++ clients/chfn/Makefile.in 4 Jan 2009 05:48:51 -0000
@@ -40,7 +40,7 @@
depend:
install: all
- $(INSTALL_PROGRAM) $(TARGET) $(bindir)
+ $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir)
$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $@.o $(LIBS)
Index: clients/chpobox/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/clients/chpobox/Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 Makefile.in
--- clients/chpobox/Makefile.in 16 Mar 2000 06:03:30 -0000 1.1
+++ clients/chpobox/Makefile.in 4 Jan 2009 05:48:51 -0000
@@ -40,7 +40,7 @@
depend:
install: all
- $(INSTALL_PROGRAM) $(TARGET) $(bindir)
+ $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir)
$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $@.o $(LIBS)
Index: clients/chsh/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/clients/chsh/Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 Makefile.in
--- clients/chsh/Makefile.in 16 Mar 2000 06:03:59 -0000 1.1
+++ clients/chsh/Makefile.in 4 Jan 2009 05:48:51 -0000
@@ -40,7 +40,7 @@
depend:
install: all
- $(INSTALL_PROGRAM) $(TARGET) $(bindir)
+ $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir)
$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $@.o $(LIBS)
Index: clients/mailmaint/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/clients/mailmaint/Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 Makefile.in
--- clients/mailmaint/Makefile.in 12 Jul 1999 16:20:49 -0000 1.5
+++ clients/mailmaint/Makefile.in 4 Jan 2009 05:48:52 -0000
@@ -40,7 +40,7 @@
depend:
install: all
- $(INSTALL_PROGRAM) mailmaint $(bindir)
+ $(INSTALL_PROGRAM) mailmaint $(DESTDIR)$(bindir)
$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
Index: clients/mitch/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/clients/mitch/Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 Makefile.in
--- clients/mitch/Makefile.in 4 Feb 2003 04:44:41 -0000 1.1
+++ clients/mitch/Makefile.in 4 Jan 2009 05:48:52 -0000
@@ -40,7 +40,7 @@
depend:
install: all
- $(INSTALL_PROGRAM) mitch $(bindir)
+ $(INSTALL_PROGRAM) mitch $(DESTDIR)$(bindir)
$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
Index: clients/moira/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/clients/moira/Makefile.in,v
retrieving revision 1.9
diff -u -r1.9 Makefile.in
--- clients/moira/Makefile.in 10 Feb 2000 19:14:05 -0000 1.9
+++ clients/moira/Makefile.in 4 Jan 2009 05:48:52 -0000
@@ -44,14 +44,14 @@
depend:
install: all
- $(INSTALL_PROGRAM) namespace $(bindir)
- $(INSTALL_PROGRAM) moira $(bindir)
- rm -f $(bindir)/listmaint
- ln -s moira $(bindir)/listmaint
- rm -f $(bindir)/dcmmaint
- ln -s moira $(bindir)/dcmmaint
- rm -f $(bindir)/usermaint
- ln -s moira $(bindir)/usermaint
+ $(INSTALL_PROGRAM) namespace $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) moira $(DESTDIR)$(bindir)
+ rm -f $(DESTDIR)$(bindir)/listmaint
+ ln -s moira $(DESTDIR)$(bindir)/listmaint
+ rm -f $(DESTDIR)$(bindir)/dcmmaint
+ ln -s moira $(DESTDIR)$(bindir)/dcmmaint
+ rm -f $(DESTDIR)$(bindir)/usermaint
+ ln -s moira $(DESTDIR)$(bindir)/usermaint
moira: $(MOBJS) ../lib/libmrclient.a $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(MOBJS) $(LIBS)
Index: clients/mrcheck/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/clients/mrcheck/Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 Makefile.in
--- clients/mrcheck/Makefile.in 12 Jul 1999 16:20:58 -0000 1.5
+++ clients/mrcheck/Makefile.in 4 Jan 2009 05:48:52 -0000
@@ -40,7 +40,7 @@
depend:
install: all
- $(INSTALL_PROGRAM) mrcheck $(bindir)
+ $(INSTALL_PROGRAM) mrcheck $(DESTDIR)$(bindir)
$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
Index: clients/mrtest/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/clients/mrtest/Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 Makefile.in
--- clients/mrtest/Makefile.in 12 Jul 1999 16:20:59 -0000 1.5
+++ clients/mrtest/Makefile.in 4 Jan 2009 05:48:52 -0000
@@ -40,7 +40,7 @@
depend:
install: all
- $(INSTALL_PROGRAM) mrtest $(bindir)
+ $(INSTALL_PROGRAM) mrtest $(DESTDIR)$(bindir)
$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
Index: clients/stanley/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/clients/stanley/Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 Makefile.in
--- clients/stanley/Makefile.in 25 Sep 2001 23:00:01 -0000 1.1
+++ clients/stanley/Makefile.in 4 Jan 2009 05:48:52 -0000
@@ -40,7 +40,7 @@
depend:
install: all
- $(INSTALL_PROGRAM) stanley $(bindir)
+ $(INSTALL_PROGRAM) stanley $(DESTDIR)$(bindir)
$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
Index: clients/stella/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/clients/stella/Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 Makefile.in
--- clients/stella/Makefile.in 10 Feb 2000 05:33:43 -0000 1.1
+++ clients/stella/Makefile.in 4 Jan 2009 05:48:52 -0000
@@ -40,7 +40,7 @@
depend:
install: all
- $(INSTALL_PROGRAM) stella $(bindir)
+ $(INSTALL_PROGRAM) stella $(DESTDIR)$(bindir)
$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
Index: dbck/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/dbck/Makefile.in,v
retrieving revision 1.7
diff -u -r1.7 Makefile.in
--- dbck/Makefile.in 10 Sep 2000 02:53:27 -0000 1.7
+++ dbck/Makefile.in 4 Jan 2009 05:58:35 -0000
@@ -52,8 +52,8 @@
depend: $(CFILES)
install:
- $(INSTALL_PROGRAM) dbck $(mrbindir)
- $(INSTALL_PROGRAM) members $(mrbindir)
+ $(INSTALL_PROGRAM) dbck $(DESTDIR)$(mrbindir)
+ $(INSTALL_PROGRAM) members $(DESTDIR)$(mrbindir)
dbck: $(DBCK_OBJS) $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(DBCK_OBJS) $(LIBS)
Index: dcm/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/dcm/Makefile.in,v
retrieving revision 1.7
diff -u -r1.7 Makefile.in
--- dcm/Makefile.in 20 Jan 2000 19:18:47 -0000 1.7
+++ dcm/Makefile.in 4 Jan 2009 05:58:19 -0000
@@ -54,8 +54,8 @@
depend: $(CFILES)
install:
- $(INSTALL_PROGRAM) dcm $(mrbindir)
- $(INSTALL_PROGRAM) startdcm $(mrbindir)
+ $(INSTALL_PROGRAM) dcm $(DESTDIR)$(mrbindir)
+ $(INSTALL_PROGRAM) startdcm $(DESTDIR)$(mrbindir)
dcm: $(DCM_OBJS) $(UPDATE_OBJS) $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(DCM_OBJS) $(UPDATE_OBJS) $(SQL_LIBS) $(LIBS)
Index: gen/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/gen/Makefile.in,v
retrieving revision 1.52
diff -u -r1.52 Makefile.in
--- gen/Makefile.in 31 Oct 2008 19:33:00 -0000 1.52
+++ gen/Makefile.in 4 Jan 2009 05:58:05 -0000
@@ -72,8 +72,8 @@
depend: $(LIB_CFILES) $(CFILES)
install:
- @set -x; for p in $(TARGET); do $(INSTALL_PROGRAM) $$p $(mrbindir); done
- @set -x; for p in $(SCRIPTS); do $(INSTALL) -m 755 $$p $(mrbindir); done
+ @set -x; for p in $(TARGET); do $(INSTALL_PROGRAM) $$p $(DESTDIR)$(mrbindir); done
+ @set -x; for p in $(SCRIPTS); do $(INSTALL) -m 755 $$p $(DESTDIR)$(mrbindir); done
libdcm.a: $(LIB_OBJS)
ar cru $@ $(LIB_OBJS)
Index: incremental/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/incremental/Makefile.in,v
retrieving revision 1.10
diff -u -r1.10 Makefile.in
--- incremental/Makefile.in 2 Jan 2003 01:05:36 -0000 1.10
+++ incremental/Makefile.in 4 Jan 2009 05:57:11 -0000
@@ -48,7 +48,7 @@
@for d in $(SUBDIRS); do (echo "### Making $@ in incremental/$$d"; cd $$d; $(MAKE) $@) || exit 1; done
install:
- $(INSTALL_PROGRAM) ksrvtgt $(mrbindir)
+ $(INSTALL_PROGRAM) ksrvtgt $(DESTDIR)$(mrbindir)
@for d in $(SUBDIRS); do (echo "### Making $@ in incremental/$$d"; cd $$d; $(MAKE) $@) || exit 1; done
ksrvtgt: $(KSRVTGT_OBJS)
Index: incremental/afs/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/incremental/afs/Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 Makefile.in
--- incremental/afs/Makefile.in 25 Sep 2002 20:46:53 -0000 1.2
+++ incremental/afs/Makefile.in 4 Jan 2009 05:56:49 -0000
@@ -46,8 +46,8 @@
depend:
install:
- $(INSTALL_PROGRAM) afs.incr $(mrbindir)
- @set -x; for p in afs_create.pl afs_nightly.pl afs_quota.pl afs_rename.pl afs_utils.pl; do $(INSTALL_PROGRAM) $$p $(mrbindir); done
+ $(INSTALL_PROGRAM) afs.incr $(DESTDIR)$(mrbindir)
+ @set -x; for p in afs_create.pl afs_nightly.pl afs_quota.pl afs_rename.pl afs_utils.pl; do $(INSTALL_PROGRAM) $$p $(DESTDIR)$(mrbindir); done
afs.incr: $(AFS_OBJS) $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(AFS_OBJS) $(AFS_LIBS) -lprot -lauth \
Index: incremental/mailman/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/incremental/mailman/Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 Makefile.in
--- incremental/mailman/Makefile.in 3 Dec 2002 21:40:33 -0000 1.1
+++ incremental/mailman/Makefile.in 4 Jan 2009 05:56:28 -0000
@@ -19,4 +19,4 @@
clean:
install:
- ${INSTALL_PROGRAM} ${TARGET} ${mrbindir}
+ ${INSTALL_PROGRAM} ${TARGET} $(DESTDIR)${mrbindir}
Index: incremental/winad/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/incremental/winad/Makefile.in,v
retrieving revision 1.3
diff -u -r1.3 Makefile.in
--- incremental/winad/Makefile.in 13 May 2006 02:36:08 -0000 1.3
+++ incremental/winad/Makefile.in 4 Jan 2009 05:56:19 -0000
@@ -45,7 +45,7 @@
depend:
install:
- $(INSTALL_PROGRAM) winad.incr $(mrbindir)
+ $(INSTALL_PROGRAM) winad.incr $(DESTDIR)$(mrbindir)
winad.incr: $(WINAD_OBJS) $(MR_LIBDEP)
$(CC) -o $@ $(LDAP_LIBS) $(LDFLAGS) $(WINAD_OBJS) -lldap -llber \
Index: man/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/man/Makefile.in,v
retrieving revision 1.7
diff -u -r1.7 Makefile.in
--- man/Makefile.in 4 Feb 2003 04:42:04 -0000 1.7
+++ man/Makefile.in 4 Jan 2009 05:48:52 -0000
@@ -32,6 +32,7 @@
depend:
install:
- for m in $(MAN1); do $(INSTALL_DATA) $(srcdir)/$$m $(mandir)/man1; done
- for m in $(MAN3); do $(INSTALL_DATA) $(srcdir)/$$m $(mandir)/man3; done
- for m in $(MAN8); do $(INSTALL_DATA) $(srcdir)/$$m $(mandir)/man8; done
+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man3 $(DESTDIR)$(mandir)/man8
+ for m in $(MAN1); do $(INSTALL_DATA) $(srcdir)/$$m $(DESTDIR)$(mandir)/man1; done
+ for m in $(MAN3); do $(INSTALL_DATA) $(srcdir)/$$m $(DESTDIR)$(mandir)/man3; done
+ for m in $(MAN8); do $(INSTALL_DATA) $(srcdir)/$$m $(DESTDIR)$(mandir)/man8; done
Index: reg_svr/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/reg_svr/Makefile.in,v
retrieving revision 1.12
diff -u -r1.12 Makefile.in
--- reg_svr/Makefile.in 20 Jan 2000 19:18:49 -0000 1.12
+++ reg_svr/Makefile.in 4 Jan 2009 05:56:08 -0000
@@ -56,10 +56,10 @@
depend: $(CFILES)
install:
- $(INSTALL_PROGRAM) reg_svr $(mrbindir)
- $(INSTALL_PROGRAM) startreg $(mrbindir)
- $(INSTALL_PROGRAM) genkey $(mrbindir)
- $(INSTALL_PROGRAM) genwords $(mrbindir)
+ $(INSTALL_PROGRAM) reg_svr $(DESTDIR)$(mrbindir)
+ $(INSTALL_PROGRAM) startreg $(DESTDIR)$(mrbindir)
+ $(INSTALL_PROGRAM) genkey $(DESTDIR)$(mrbindir)
+ $(INSTALL_PROGRAM) genwords $(DESTDIR)$(mrbindir)
reg_svr: $(REG_OBJS) $(MR_LIBDEP) $(RSAREF_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(REG_OBJS) $(LIBS) $(SQL_LIBS)
Index: regtape/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/regtape/Makefile.in,v
retrieving revision 1.12
diff -u -r1.12 Makefile.in
--- regtape/Makefile.in 16 Sep 2002 22:19:33 -0000 1.12
+++ regtape/Makefile.in 4 Jan 2009 05:55:48 -0000
@@ -55,8 +55,8 @@
depend: $(CFILES)
install:
- @set -x; for p in $(TARGET); do $(INSTALL_PROGRAM) $$p $(mrbindir); done
- @set -x; for p in $(SCRIPTS); do $(INSTALL_PROGRAM) $$p $(mrbindir); done
+ @set -x; for p in $(TARGET); do $(INSTALL_PROGRAM) $$p $(DESTDIR)$(mrbindir); done
+ @set -x; for p in $(SCRIPTS); do $(INSTALL_PROGRAM) $$p $(DESTDIR)$(mrbindir); done
student: $(STUDENT_OBJS) $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(STUDENT_OBJS) $(SQL_LIBS) $(LIBS)
Index: server/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/server/Makefile.in,v
retrieving revision 2.8
diff -u -r2.8 Makefile.in
--- server/Makefile.in 1 Apr 2001 05:31:11 -0000 2.8
+++ server/Makefile.in 4 Jan 2009 05:55:03 -0000
@@ -56,8 +56,8 @@
depend: $(CFILES)
install:
- $(INSTALL_PROGRAM) moirad $(mrbindir)
- $(INSTALL_PROGRAM) startmoira $(mrbindir)
+ $(INSTALL_PROGRAM) moirad $(DESTDIR)$(mrbindir)
+ $(INSTALL_PROGRAM) startmoira $(DESTDIR)$(mrbindir)
moirad: $(SERVER_OBJS) $(SCHEMA_OBJS) $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(SERVER_OBJS) $(SCHEMA_OBJS) $(SQL_LIBS) $(LIBS)
Index: update/Makefile.in
===================================================================
RCS file: /mit/moiradev/repository/moira/update/Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 Makefile.in
--- update/Makefile.in 22 Aug 2006 17:36:26 -0000 1.5
+++ update/Makefile.in 4 Jan 2009 05:48:52 -0000
@@ -43,8 +43,8 @@
depend:
install: all
- $(INSTALL_PROGRAM) update_test $(bindir)
- $(INSTALL_PROGRAM) update_server $(sbindir)
+ $(INSTALL_PROGRAM) update_test $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) update_server $(DESTDIR)$(sbindir)
update_test: $(COBJS) $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(COBJS) $(LIBS)
--------------020509070205070204070204
Content-Type: text/x-diff;
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 4 Jan 2009 06:19:35 -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,7 @@
install: all
$(INSTALL_PROGRAM) update_test $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) update_server $(DESTDIR)$(sbindir)
+ $(INSTALL) -m 644 -D moira.conf $(DESTDIR)$(sysconfdir)/athena/moira.conf
update_test: $(COBJS) $(MR_LIBDEP)
$(CC) -o $@ $(LDFLAGS) $(COBJS) $(LIBS)
--------------020509070205070204070204--
