From 09fbe94d187702bcaed28f75c19ce669b5399af3 Mon Sep 17 00:00:00 2001 From: Fons Rademakers <Fons.Rademakers@cern.ch> Date: Mon, 15 Nov 2010 14:03:21 +0000 Subject: [PATCH] correct target to copy run-time directories (etc, macros, etc) at end of out-of-source build. git-svn-id: http://root.cern.ch/svn/root/trunk@36667 27541ba8-7e3a-0410-8455-c3a389f83636 --- Makefile | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 0c2e764cf3a..2d0a60bf584 100644 --- a/Makefile +++ b/Makefile @@ -440,8 +440,9 @@ endif ##### Utilities ##### ifneq ($(ROOT_OBJDIR),$(ROOT_SRCDIR)) - MAKEDIR = +@[ -d $(dir $@) ] || mkdir -p $(dir $@) - POSTBIN += copydirs + MAKEDIR = +@[ -d $(dir $@) ] || mkdir -p $(dir $@) + RUNTIMEDIRS := etc macros icons fonts README tutorials test man + POSTBIN += $(RUNTIMEDIRS) endif MAKEDEP = $(RMKDEP) @@ -1193,7 +1194,7 @@ uninstall: ifneq ($(ROOT_OBJDIR),$(ROOT_SRCDIR)) # install directrories needed at run-time -copydirs: +$(RUNTIMEDIRS): @echo "Rsync'ing $(ROOT_SRCDIR)/etc..."; \ $(RSYNC) \ --exclude '.svn' \ @@ -1212,11 +1213,17 @@ copydirs: echo "Rsync'ing $(ROOT_SRCDIR)/macros..."; \ $(RSYNC) \ --exclude '.svn' \ - --exclude root.mimes \ + --exclude html.C \ $(ROOT_SRCDIR)/macros . ; \ for d in icons fonts README tutorials test man; do \ echo "Rsync'ing $(ROOT_SRCDIR)/$$d..."; \ - $(RSYNC) --exclude '.svn' $(ROOT_SRCDIR)/$$d . ; \ + $(RSYNC) \ + --exclude '.svn' \ + --exclude '*.o' \ + --exclude '*.so' \ + --exclude '*.lib' \ + --exclude '*.dll' \ + $(ROOT_SRCDIR)/$$d . ; \ done; endif -- GitLab