diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-07-25 23:32:13 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-07-25 23:32:13 -0400 |
| commit | 14463101d5acc7a3f85df15b9229f5798145299a (patch) | |
| tree | f0bf2e8de9dd66aa5a89d06c0bca70c75a7caf20 | |
| parent | 67f1f31c5a4ea264abe0237a88b98cf79ed07052 (diff) | |
Fix things
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | rules/_generic/Makefile | 2 | ||||
| -rw-r--r-- | rules/plexus-build-api/version.mk | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -45,7 +45,7 @@ export JAR_DIR := $(shell $(CAT) conf/jardir.txt) # Post-processing for conf/sources.mk packages := $(filter-out _%,$(variables)) -specs := $(foreach variable,$(variables),$(findstring |,$($(variable)))) +specs := $(foreach variable,$(variables),$(if $(findstring |,$($(variable))),$($(variable)))) tarbombs := $(addprefix build/extract/,$(call spec2,base,$(_tarbombs))) # download ##################################################################### diff --git a/rules/_generic/Makefile b/rules/_generic/Makefile index bb2f721..e63c54b 100644 --- a/rules/_generic/Makefile +++ b/rules/_generic/Makefile @@ -41,7 +41,7 @@ javac_source := $(firstword $(call pom_get,/project/properties/maven.compile. javac_target := $(firstword $(call pom_get,/project/properties/maven.compile.target /project/properties/maven.compiler.target $(call plugin_conf,maven-compiler-plugin,target) ) $(value javac_target)) javac_encoding := $(firstword $(call pom_get,/project/properties/project.build.sourceEncoding $(call plugin_conf,maven-compiler-plugin,encoding)) $(value javac_encoding)) -basedir = . +basedir := $(shell pwd) project.basedir = $(basedir) subdirs = $(patsubst %/pom.xml,%,$(wildcard */pom.xml)) targets = pom $(if $(wildcard $(sourceDirectory) $(resources)),jar) diff --git a/rules/plexus-build-api/version.mk b/rules/plexus-build-api/version.mk index b625d2f..cc1f20a 100644 --- a/rules/plexus-build-api/version.mk +++ b/rules/plexus-build-api/version.mk @@ -1,2 +1,2 @@ -src/main/resources/org/sonatype/plexus/build/incremental/version.properties: FORCE +src/main/resources/org/sonatype/plexus/build/incremental/version.properties: pom.xml sed -i 's/^api\.version\s*=.*/api.version = $(version)/' $@ |