From 6d47462abb47292fb59f36ecd49d141a710e5ebe Mon Sep 17 00:00:00 2001 From: twouters Date: Tue, 11 Mar 2003 00:33:31 +0000 Subject: SF patch #683906, add $DESTDIR to install target, by Ademar de Souza Reis Jr, after much checking and rechecking (and some massaging) by me. Checking in now before I fall asleep and forget what all this was for. This patch adds the ability to 'make DESTDIR=/some/dir/tree install' that doesn't influence the paths stored in e.g. Defaults.py at all, which is of good use for various package managers. It is not all that package managers must do, however! Running make install with DESTDIR set means bin/update is never run, and mm_cfg.py is always written; package managers should make sure the appropriate post-installation is done, and that mm_cfg.py is treated as a config file. This patch inadvertently fixes some bogus whitespace: 8-spaces where surrounding code used tabs. The difference was harmless because the 8-spaces were used inside shell-continued-oneliners, but it is confusing and could lead to future harm. I'm too tired to make those two or three changes in a separate checkin, sorry. This patch also assumes the various packages that are installed using distutils do not record (or rather, use) their installation paths anywhere, but this seems to hold true at least for the moment. Also, I've done so many slow cvs diff's, I'm wondering when we'll switch to Subversion. Unfortunately, I've also done so many 'cvs diff -c > file; patch -p0 -R < file's to switch back and forth between patches and change sets, I'm wondering when we'll switch to Aegis as well. :-P --- cron/Makefile.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cron') diff --git a/cron/Makefile.in b/cron/Makefile.in index 2f5967516..91652ad5c 100644 --- a/cron/Makefile.in +++ b/cron/Makefile.in @@ -25,6 +25,7 @@ srcdir= @srcdir@ bindir= @bindir@ prefix= @prefix@ exec_prefix= @exec_prefix@ +DESTDIR= CC= @CC@ CHMOD= @CHMOD@ @@ -60,11 +61,11 @@ all: install: for f in $(FILES); \ do \ - $(INSTALL) -m $(FILEMODE) $$f $(CRONDIR); \ + $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(CRONDIR); \ done for f in $(PROGRAMS); \ do \ - $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(CRONDIR); \ + $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(CRONDIR); \ done finish: -- cgit v1.2.3-70-g09d2