From 2f4d95f002f4b4a11ce44ac926c63dcf8297102f Mon Sep 17 00:00:00 2001 From: zacheiss Date: Mon, 5 Jan 2009 22:25:07 +0000 Subject: [PATCH] DESTDIR support. --- Makefile.in | 4 ++-- afssync/Makefile.in | 6 +++--- backup/Makefile.in | 6 +++--- clients/addusr/Makefile.in | 2 +- clients/blanche/Makefile.in | 2 +- clients/chfn/Makefile.in | 2 +- clients/chpobox/Makefile.in | 2 +- clients/chsh/Makefile.in | 2 +- clients/mailmaint/Makefile.in | 2 +- clients/mitch/Makefile.in | 2 +- clients/moira/Makefile.in | 16 ++++++++-------- clients/mrcheck/Makefile.in | 2 +- clients/mrtest/Makefile.in | 2 +- clients/stanley/Makefile.in | 2 +- clients/stella/Makefile.in | 2 +- dbck/Makefile.in | 4 ++-- dcm/Makefile.in | 4 ++-- gen/Makefile.in | 4 ++-- incremental/Makefile.in | 2 +- incremental/afs/Makefile.in | 4 ++-- incremental/mailman/Makefile.in | 2 +- incremental/winad/Makefile.in | 2 +- man/Makefile.in | 7 ++++--- reg_svr/Makefile.in | 8 ++++---- regtape/Makefile.in | 4 ++-- server/Makefile.in | 4 ++-- update/Makefile.in | 7 +++++-- 27 files changed, 55 insertions(+), 51 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5eefbd8b..3d11e887 100644 --- 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 5421c00e..c3950e18 100644 --- 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 403d3eed..1213a953 100644 --- 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 10a8e694..cf4d9ed7 100644 --- 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 7811eaab..54d8d654 100644 --- 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 5df5656f..6bd811ea 100644 --- 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 4e8532f7..3ba951e2 100644 --- 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 399904d1..b94aacf8 100644 --- 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 12fd8618..39bdd30f 100644 --- 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 d82290d9..6d83d145 100644 --- 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 72cb76c3..34dfe682 100644 --- 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 25b149e8..573b6b72 100644 --- 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 2ea963e7..592b662f 100644 --- 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 dd5265bd..5240c673 100644 --- 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 3dc1b046..23f2606e 100644 --- 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 33b27d77..9e6c8ba7 100644 --- 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 b85d220f..f794b4f3 100644 --- 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 8e3acb84..315a2256 100644 --- 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 208e5a69..66f1ca48 100644 --- 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 1e717233..802d676f 100644 --- 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 bd8f3d85..459a65f7 100644 --- 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 f227c0de..38c95161 100644 --- 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 46118eb4..a97b9979 100644 --- 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 be17e858..79d42929 100644 --- 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 bfea75eb..5917c08d 100644 --- 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 cd8d1984..75350372 100644 --- 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 0181ead0..20d20528 100644 --- 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) -- 2.45.1