diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-30 18:30:20 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-30 18:30:20 -0400 |
| commit | f0f43a8284a9da7ebd3c2ab08e8b4e146ba42047 (patch) | |
| tree | d0ba073182031409da7252de29849f377a23a51f /Makefile | |
| parent | eab9c85680f0370e1cacae4a729120f47f4ca69e (diff) | |
fiddle with directory names
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -82,9 +82,9 @@ $(foreach package,$(packages),$(if $(filter-out svn|%,$($(package))),$(eval \ # place (patch) ################################################################ -place: PHONY $(addprefix,build/compile/,$(packages)) +place: PHONY $(addprefix,build/workdir/,$(packages)) -build/compile/%: +build/workdir/%: rm -rf '$@' mkdir -p '$(@D)' cp -a '$<' '$@' @@ -99,7 +99,7 @@ build/compile/%: # Loop over our source configuration and set up the dependencies # beteen `build/compile` and `build/extract`. $(foreach package,$(packages),$(eval \ - build/compile/$(package): \ + build/workdir/$(package): \ build/extract/$(shell utils/spec2file '$($(package))') \ )) @@ -115,19 +115,19 @@ deps2jars = $(filter %.jar,$1) $(call dirs2jars,$(filter build/packages/%,$1)) deps2classpath = $(shell echo $(abspath $(call deps2jars,$1)) | tr ' ' :) $(addprefix build/packages/,$(package_specific)): \ -build/packages/%: RECURSIVE build/compile/% makefiles/%.mk - $(MAKE) -C build/compile/$* -f '$(top)/makefiles/$*.mk' install \ +build/packages/%: RECURSIVE build/workdir/% makefiles/%.mk + $(MAKE) -C build/workdir/$* -f '$(top)/makefiles/$*.mk' install \ DESTDIR='$(top)/$@' \ CLASSPATH='$(call deps2classpath,$^)' - mkdir -p build/packages/dest && lndir -silent '$(top)/$@' build/packages/dest + mkdir -p build/packages/all && lndir -silent '$(top)/$@' build/packages/all $(addprefix build/packages/,$(package_generic)): \ -build/packages/%: RECURSIVE build/compile/% makefiles/mvn-simple.mk - $(MAKE) -C build/compile/$* -f '$(top)/makefiles/mvn-simple.mk' install \ +build/packages/%: RECURSIVE build/workdir/% makefiles/mvn-simple.mk + $(MAKE) -C build/workdir/$* -f '$(top)/makefiles/mvn-simple.mk' install \ DESTDIR='$(top)/$@' \ CLASSPATH='$(call deps2classpath,$^)' - mkdir -p build/packages/dest && lndir -silent '$(top)/$@' build/packages/dest + mkdir -p build/packages/all && lndir -silent '$(top)/$@' build/packages/all # boilerplate ################################################################## |