(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.

diff --git a/Make.mk b/Make.mk
index eda5e1fc5cc51d43367124834f1dddd5f2daa5cd..f69ea03c430052bde8948e5d41c046178f4595b6 100644 (file)
--- 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
 
 #