diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-06-29 18:06:09 -0600 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-06-29 18:06:09 -0600 |
| commit | d30874268fed814a46262f5e3592bfcf76643aea (patch) | |
| tree | a6741dbfcce235b23563b85f01a856b5bb8d86b1 /common.bottom.mk | |
| parent | bd22a9cc04ad031bc3d472d7b9d61306f6247b4f (diff) | |
(rvs) Makefile: whoops, dist_files should go in srcdir, not objdir
Diffstat (limited to 'common.bottom.mk')
| -rw-r--r-- | common.bottom.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/common.bottom.mk b/common.bottom.mk index 016e093..2d56297 100644 --- a/common.bottom.mk +++ b/common.bottom.mk @@ -28,7 +28,7 @@ $(module)_sys_files := $(addprefix $(DESTDIR)/,$(sys_files)) $(module)_clean_files := $(addprefix $(objdir)/,$(clean_files)) $(module)_slow_files := $(addprefix $(objdir)/,$(slow_files)) $(module)_conf_files := $(addprefix $(objdir)/,$(conf_files)) -$(module)_dist_files := $(addprefix $(objdir)/,$(dist_files)) +$(module)_dist_files := $(addprefix $(srcdir)/,$(dist_files)) # And add them to the $(parent)_*_files variables (if applicable) ifneq ($(parent),) @@ -110,8 +110,7 @@ _addfile = $(call _copyfile,$3,$2/$(call _relto,$1,$3)) $(topobjdir)/$(PACKAGE)-$(VERSION): $(all_src_files) $(dep_src_files) $(all_dist_files) $(dep_dist_files) $(RM) -r $@ $(MKDIR) $(@D)/tmp.$(@F).$$$$ && \ - $(foreach f,$(all_src_files) $(dep_src_files) ,$(call _addfile,$(topsrcdir),$(@D)/tmp.$(@F).$$$$,$f) &&) \ - $(foreach f,$(all_dist_files) $(dep_dist_files),$(call _addfile,$(topobjdir),$(@D)/tmp.$(@F).$$$$,$f) &&) \ + $(foreach f,$^,$(call _addfile,$(topsrcdir),$(@D)/tmp.$(@F).$$$$,$f) &&) \ $(MV) $(@D)/tmp.$(@F).$$$$ $@ || $(RM) -r $(@D)/tmp.$(@F).$$$$ include $(topsrcdir)/common.once.mk |