From 2e7c9edf5ecde0a4ef2865dfc8f6bca01d47b9b7 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 23 Jan 2006 21:14:53 +0000 Subject: [PATCH] (sources.mk): Link from $(srcdir) if compiling from tarball. Why? It's distributed in $(srcdir), but required in build directory. (distclean, bld_distgen): Don't distribute subjects.mk, it's not being used with a separate build tree. --- Make.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Make.mk b/Make.mk index eda5e1fc..f69ea03c 100644 --- a/Make.mk +++ b/Make.mk @@ -118,11 +118,11 @@ endif clean := $(obj) $(deps) $(libs) $(util) $(client) $(server) $(tsubj) \ $(ttop) $(info.nr) $(info.html) $(empth_obj) $(empth_lib) # Removed by distclean: -distclean := $(ac) +distclean := $(ac) subjects.mk # Distributed by dist-source from $(srcdir) src_distgen := $(acdist) # Distributed by dist-source from . -bld_distgen := $(mk) +bld_distgen := sources.mk # Distributed by dist-client from $(srcdir)/src/client cli_distgen := $(acdistcli) @@ -276,6 +276,9 @@ ifeq ($(cvs_controlled),yes) # Find files and directories under CVS control sources.mk: $(scripts)/cvsfiles.awk $(addprefix $(srcdir)/, $(addsuffix CVS/Entries, $(dirs))) echo 'src := ' `cd $(srcdir) && $(AWK) -f src/scripts/cvsfiles.awk` >$@ +else +sources.mk: $(srcdir)/sources.mk + cp -f $^ $@ endif #