diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-04-07 13:15:27 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-04-07 20:41:00 +0200 |
| commit | 1555d3e1131526f5d446254a0365deee95b31922 (patch) | |
| tree | 38ab4f79186288540163fb0ef30d866a34ffdb76 | |
| parent | 8be7754124a4db958e64fac53c41f6cb826a8673 (diff) | |
| download | ptxdist-1555d3e1131526f5d446254a0365deee95b31922.tar.gz ptxdist-1555d3e1131526f5d446254a0365deee95b31922.tar.xz | |
[template-src-*-make] use "trunk" if requested by user
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
(cherry picked from commit e6dd06522735dfe652ba493140ab919f6e7df505)
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | rules/templates/template-src-autoconf-make | 4 | ||||
| -rw-r--r-- | rules/templates/template-src-cmake-prog-make | 4 | ||||
| -rw-r--r-- | rules/templates/template-src-stellaris-make | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/rules/templates/template-src-autoconf-make b/rules/templates/template-src-autoconf-make index c8081fd34..42f055ef9 100644 --- a/rules/templates/template-src-autoconf-make +++ b/rules/templates/template-src-autoconf-make @@ -16,7 +16,11 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@ # # Paths and names # +ifdef PTXCONF_@PACKAGE@_TRUNK +@PACKAGE@_VERSION := trunk +else @PACKAGE@_VERSION := @VERSION@ +endif @PACKAGE@ := @package@-$(@PACKAGE@_VERSION) @PACKAGE@_URL := file://$(PTXDIST_WORKSPACE)/local_src/$(@PACKAGE@) @PACKAGE@_DIR := $(BUILDDIR)/$(@PACKAGE@) diff --git a/rules/templates/template-src-cmake-prog-make b/rules/templates/template-src-cmake-prog-make index 18c40a22f..c381fa1e2 100644 --- a/rules/templates/template-src-cmake-prog-make +++ b/rules/templates/template-src-cmake-prog-make @@ -16,7 +16,11 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@ # # Paths and names # +ifdef PTXCONF_@PACKAGE@_TRUNK +@PACKAGE@_VERSION := trunk +else @PACKAGE@_VERSION := @VERSION@ +endif @PACKAGE@ := @package@-$(@PACKAGE@_VERSION) @PACKAGE@_URL := file://$(PTXDIST_WORKSPACE)/local_src/$(@PACKAGE@) @PACKAGE@_DIR := $(BUILDDIR)/$(@PACKAGE@) diff --git a/rules/templates/template-src-stellaris-make b/rules/templates/template-src-stellaris-make index 7ea8ada86..7c5628e8d 100644 --- a/rules/templates/template-src-stellaris-make +++ b/rules/templates/template-src-stellaris-make @@ -27,7 +27,11 @@ endif # # Paths and names # +ifdef PTXCONF_@PACKAGE@_TRUNK +@PACKAGE@_VERSION := trunk +else @PACKAGE@_VERSION := @VERSION@ +endif @PACKAGE@ := @package@-$(@PACKAGE@_VERSION) @PACKAGE@_URL := file://$(PTXDIST_WORKSPACE)/local_src/$(@PACKAGE@) @PACKAGE@_DIR := $(BUILDDIR)/$(@PACKAGE@) |