DESTDIR support.

diff --git a/Makefile.in b/Makefile.in
index 5eefbd8b32c67a39573d8fc9b815741f99508211..3d11e8879d4ce65f4db8664b1b85b1708459349b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,11 +35,11 @@ depend:
        @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

diff --git a/afssync/Makefile.in b/afssync/Makefile.in
index 5421c00e829ec29899570a34e9691031fc21b64d..c3950e18b2a99e7674a2c31eb341559750c6d084 100644 (file)
--- a/afssync/Makefile.in
+++ b/afssync/Makefile.in
@@ -56,9 +56,9 @@ cleandir distclean: clean
 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)

diff --git a/backup/Makefile.in b/backup/Makefile.in
index 403d3eedb784e202e8cb5d40d01c119e03fab8f8..1213a9534663ae3291d5cd99b822377ff99451e7 100644 (file)
--- a/backup/Makefile.in
+++ b/backup/Makefile.in
@@ -52,9 +52,9 @@ cleandir distclean: clean
 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)

diff --git a/clients/addusr/Makefile.in b/clients/addusr/Makefile.in
index 10a8e694f9d9f86bd42905dd14eab8e452ef462e..cf4d9ed769e0924e658a279b39d60adc9bd95ad9 100644 (file)
--- a/clients/addusr/Makefile.in
+++ b/clients/addusr/Makefile.in
@@ -40,7 +40,7 @@ cleandir distclean: clean
 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)

diff --git a/clients/blanche/Makefile.in b/clients/blanche/Makefile.in
index 7811eaabe661b1f65a68074173585c488471c9b2..54d8d6543da4df4eed9ebe9f1e7aef47e8ad79dc 100644 (file)
--- a/clients/blanche/Makefile.in
+++ b/clients/blanche/Makefile.in
@@ -40,7 +40,7 @@ cleandir distclean: clean
 depend:
 
 install: all
-       $(INSTALL_PROGRAM) blanche $(bindir)
+       $(INSTALL_PROGRAM) blanche $(DESTDIR)$(bindir)
 
 $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
        $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)

diff --git a/clients/chfn/Makefile.in b/clients/chfn/Makefile.in
index 5df5656f73b5175349982acfb2b277d865c2dab5..6bd811ead0d3037e4c7b2f83adbf3bc83fe16a50 100644 (file)
--- a/clients/chfn/Makefile.in
+++ b/clients/chfn/Makefile.in
@@ -40,7 +40,7 @@ cleandir distclean: clean
 depend:
 
 install: all
-       $(INSTALL_PROGRAM) $(TARGET) $(bindir)
+       $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir)
 
 $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
        $(CC) -o $@ $(LDFLAGS) $@.o $(LIBS)

diff --git a/clients/chpobox/Makefile.in b/clients/chpobox/Makefile.in
index 4e8532f7411b3b60f294aac10b9225aa752b3fae..3ba951e251799f6fb87c93f3538f98e0733e8830 100644 (file)
--- a/clients/chpobox/Makefile.in
+++ b/clients/chpobox/Makefile.in
@@ -40,7 +40,7 @@ cleandir distclean: clean
 depend:
 
 install: all
-       $(INSTALL_PROGRAM) $(TARGET) $(bindir)
+       $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir)
 
 $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
        $(CC) -o $@ $(LDFLAGS) $@.o $(LIBS)

diff --git a/clients/chsh/Makefile.in b/clients/chsh/Makefile.in
index 399904d11c4c73f92004ccfa36b0aed6b0aa6710..b94aacf80d74ae03cfc6bfcfce3fea68eb160911 100644 (file)
--- a/clients/chsh/Makefile.in
+++ b/clients/chsh/Makefile.in
@@ -40,7 +40,7 @@ cleandir distclean: clean
 depend:
 
 install: all
-       $(INSTALL_PROGRAM) $(TARGET) $(bindir)
+       $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir)
 
 $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
        $(CC) -o $@ $(LDFLAGS) $@.o $(LIBS)

diff --git a/clients/mailmaint/Makefile.in b/clients/mailmaint/Makefile.in
index 12fd861886fb89f953b2547be6c1f9b222f477ca..39bdd30fd15d8684328c2d8bedc9889c4286feb2 100644 (file)
--- a/clients/mailmaint/Makefile.in
+++ b/clients/mailmaint/Makefile.in
@@ -40,7 +40,7 @@ cleandir distclean: clean
 depend:
 
 install: all
-       $(INSTALL_PROGRAM) mailmaint $(bindir)
+       $(INSTALL_PROGRAM) mailmaint $(DESTDIR)$(bindir)
 
 $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
        $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)

diff --git a/clients/mitch/Makefile.in b/clients/mitch/Makefile.in
index d82290d9cf3858f144b1dfd320231c6c3641f12f..6d83d1457781293f4c791f00856875af93ec41d8 100644 (file)
--- a/clients/mitch/Makefile.in
+++ b/clients/mitch/Makefile.in
@@ -40,7 +40,7 @@ cleandir distclean: clean
 depend:
 
 install: all
-       $(INSTALL_PROGRAM) mitch $(bindir)
+       $(INSTALL_PROGRAM) mitch $(DESTDIR)$(bindir)
 
 $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
        $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)

diff --git a/clients/moira/Makefile.in b/clients/moira/Makefile.in
index 72cb76c3aac74ffdb983d7d34a9e450049e128e5..34dfe68246d07d0cfaf6a0f55c57f0cc96f9332f 100644 (file)
--- a/clients/moira/Makefile.in
+++ b/clients/moira/Makefile.in
@@ -44,14 +44,14 @@ cleandir distclean: clean
 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)

diff --git a/clients/mrcheck/Makefile.in b/clients/mrcheck/Makefile.in
index 25b149e8df1ad1081445ec21dfbad70a315984b2..573b6b721431519fd0315efa025bf7d9eec3db30 100644 (file)
--- a/clients/mrcheck/Makefile.in
+++ b/clients/mrcheck/Makefile.in
@@ -40,7 +40,7 @@ cleandir distclean: clean
 depend:
 
 install: all
-       $(INSTALL_PROGRAM) mrcheck $(bindir)
+       $(INSTALL_PROGRAM) mrcheck $(DESTDIR)$(bindir)
 
 $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
        $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)

diff --git a/clients/mrtest/Makefile.in b/clients/mrtest/Makefile.in
index 2ea963e7c68b561f114e795be18f6009302c5c4a..592b662f770d7591dd0cbd3401c13ff65f016ee9 100644 (file)
--- a/clients/mrtest/Makefile.in
+++ b/clients/mrtest/Makefile.in
@@ -40,7 +40,7 @@ cleandir distclean: clean
 depend:
 
 install: all
-       $(INSTALL_PROGRAM) mrtest $(bindir)
+       $(INSTALL_PROGRAM) mrtest $(DESTDIR)$(bindir)
 
 $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
        $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)

diff --git a/clients/stanley/Makefile.in b/clients/stanley/Makefile.in
index dd5265bdbd37d182b906879bc58de96c7bd84d30..5240c6735178559c536a3b73e64059b3e20e7c28 100644 (file)
--- a/clients/stanley/Makefile.in
+++ b/clients/stanley/Makefile.in
@@ -40,7 +40,7 @@ cleandir distclean: clean
 depend:
 
 install: all
-       $(INSTALL_PROGRAM) stanley $(bindir)
+       $(INSTALL_PROGRAM) stanley $(DESTDIR)$(bindir)
 
 $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
        $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)

diff --git a/clients/stella/Makefile.in b/clients/stella/Makefile.in
index 3dc1b046623a90e039003d158e31346b306122fe..23f2606eb71301e8dd5c3d19ecac8a7e719d7a81 100644 (file)
--- a/clients/stella/Makefile.in
+++ b/clients/stella/Makefile.in
@@ -40,7 +40,7 @@ cleandir distclean: clean
 depend:
 
 install: all
-       $(INSTALL_PROGRAM) stella $(bindir)
+       $(INSTALL_PROGRAM) stella $(DESTDIR)$(bindir)
 
 $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
        $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)

diff --git a/dbck/Makefile.in b/dbck/Makefile.in
index 33b27d777bd88a7675b08b37fd8375bac105b346..9e6c8ba7f68d8ff5cc1359f1cbabfd463bdf7ff5 100644 (file)
--- a/dbck/Makefile.in
+++ b/dbck/Makefile.in
@@ -52,8 +52,8 @@ cleandir distclean: clean
 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)

diff --git a/dcm/Makefile.in b/dcm/Makefile.in
index b85d220fe62758e92cea576377ac0d18737685fb..f794b4f37217fcf1428da7d736d21ec18b57f105 100644 (file)
--- a/dcm/Makefile.in
+++ b/dcm/Makefile.in
@@ -54,8 +54,8 @@ cleandir distclean: clean
 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)

diff --git a/gen/Makefile.in b/gen/Makefile.in
index 8e3acb840a4e1a0ae6abe24ced88a46750b765a1..315a2256cfe50acb8768b5a4826e0fbc2e3a0a01 100644 (file)
--- a/gen/Makefile.in
+++ b/gen/Makefile.in
@@ -72,8 +72,8 @@ cleandir distclean: clean
 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)

diff --git a/incremental/Makefile.in b/incremental/Makefile.in
index 208e5a69067fb0a47d39df48e4c1c7f877ff343c..66f1ca4824607d7445b2f5ad6fd5070f27425965 100644 (file)
--- a/incremental/Makefile.in
+++ b/incremental/Makefile.in
@@ -48,7 +48,7 @@ depend:
        @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)

diff --git a/incremental/afs/Makefile.in b/incremental/afs/Makefile.in
index 1e71723352377be31833babb463077c239ce31bd..802d676faa3ee3d6d42574637a0ade5a4ae4fece 100644 (file)
--- a/incremental/afs/Makefile.in
+++ b/incremental/afs/Makefile.in
@@ -46,8 +46,8 @@ cleandir distclean: clean
 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 \

diff --git a/incremental/mailman/Makefile.in b/incremental/mailman/Makefile.in
index bd8f3d8556e56e924dee066f314ebfce8815a9d9..459a65f7a7b60cd7efea4509e1e0b4a610bdec04 100644 (file)
--- a/incremental/mailman/Makefile.in
+++ b/incremental/mailman/Makefile.in
@@ -19,4 +19,4 @@ all:
 clean:
 
 install:
-       ${INSTALL_PROGRAM} ${TARGET} ${mrbindir}
+       ${INSTALL_PROGRAM} ${TARGET} $(DESTDIR)${mrbindir}

diff --git a/incremental/winad/Makefile.in b/incremental/winad/Makefile.in
index f227c0ded1dab7467cc57df6b774ba6a92ee8dea..38c951615cb6253ef6e9933974dbf6c9e9c48572 100644 (file)
--- a/incremental/winad/Makefile.in
+++ b/incremental/winad/Makefile.in
@@ -45,7 +45,7 @@ cleandir distclean: clean
 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 \

diff --git a/man/Makefile.in b/man/Makefile.in
index 46118eb452172d7cd664d9cd5b427b692e1c2e05..a97b99798fd0e336fe9d01520f66c268d996f39e 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -32,6 +32,7 @@ cleandir distclean: clean
 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

diff --git a/reg_svr/Makefile.in b/reg_svr/Makefile.in
index be17e8586de051e6cada302a5f09f99e6521a9cd..79d4292964edc727dbf3cdc0a5d14f8aea7cda93 100644 (file)
--- a/reg_svr/Makefile.in
+++ b/reg_svr/Makefile.in
@@ -56,10 +56,10 @@ cleandir distclean: clean
 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)

diff --git a/regtape/Makefile.in b/regtape/Makefile.in
index bfea75eb6cb7f6c2d2c0aeb29ba8a29a2d0e60e6..5917c08de8dfa1d9d68af5c348e5a0446ae32499 100644 (file)
--- a/regtape/Makefile.in
+++ b/regtape/Makefile.in
@@ -55,8 +55,8 @@ cleandir distclean: clean
 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)
 

diff --git a/server/Makefile.in b/server/Makefile.in
index cd8d1984c3fb99f70886ed1d8ad97d76a99ab728..75350372cb63e0d520301fd0811eb6e3cb638ee4 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -56,8 +56,8 @@ cleandir distclean: clean
 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)

diff --git a/update/Makefile.in b/update/Makefile.in
index 0181ead075225e0b20ca7b9b65b48b975b6afc99..20d205285ccfd5fbb2c54fb0e51a88399cda1bdb 100644 (file)
--- a/update/Makefile.in
+++ b/update/Makefile.in
@@ -22,6 +22,7 @@ prefix=@prefix@
 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
@@ -43,8 +44,10 @@ cleandir distclean: clean
 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)
+       $(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)