diff options
| author | Roland McGrath <roland@gnu.org> | 2005-04-07 08:39:43 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-04-07 08:39:43 +0000 |
| commit | 53bce6f6fda2bfbfd277072c77a77eaa5aed3baf (patch) | |
| tree | 1feddc65802ea7da301168686c61634d4a51ea90 | |
| parent | 980b34ff1ce1bdbaa5606e9cddeed92718cda253 (diff) | |
Write upstream var into branch.mk when doing make update upstream=...
| -rw-r--r-- | fedora/Makefile | 2 | ||||
| -rw-r--r-- | fedora/branch.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/fedora/Makefile b/fedora/Makefile index 5b240f6fbe..cefeab5f8b 100644 --- a/fedora/Makefile +++ b/fedora/Makefile @@ -43,7 +43,7 @@ update: cvs -Q rtag $(if $(on-branch),-r $(glibc-base),-D "$$now") $$new libc;\ )\ (echo '# This file is updated automatically by Makefile.'; \ - $(foreach var,$(branch.mk-vars),\ + $(foreach var,$(branch.mk-vars) $(if $(upstream-tag),upstream),\ $(if $($(var)),echo '$(var) := $($(var))';)) \ echo "$(glibc-branch)-sync-date := $$now"; \ echo "$(glibc-branch)-sync-tag := $$new"; \ diff --git a/fedora/branch.mk b/fedora/branch.mk index c38d2c4d48..4223a62200 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -6,3 +6,4 @@ COLLECTION := dist-fc3-updates-candidate releases-url := ftp://sources.redhat.com/pub/glibc/releases fedora-2_3-sync-date := 2005-04-07 02:42 UTC fedora-2_3-sync-tag := glibc-2_3_5 +upstream := 2.3.5 |