diff options
| author | Roland McGrath <roland@gnu.org> | 2004-09-23 01:03:59 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2004-09-23 01:03:59 +0000 |
| commit | 1547e88a9aa91cced5f4f11d126f8db1ec13b691 (patch) | |
| tree | 52ce4d0a0cac4abbb40aa426bc45c0d9c55b3f8e /fedora | |
| parent | 1a19a35223444a41e48ba03a905d9ae71b471b54 (diff) | |
Yet more update tweaks.
Diffstat (limited to 'fedora')
| -rw-r--r-- | fedora/Makefile | 4 | ||||
| -rw-r--r-- | fedora/branch.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fedora/Makefile b/fedora/Makefile index d2529394f6..b8708e2737 100644 --- a/fedora/Makefile +++ b/fedora/Makefile @@ -25,7 +25,6 @@ snapshot-id = $($(glibc-branch)-sync-tag) update: now=`date -u $(snapshot-date-fmt)`; \ name=`date -u -d "$$now" $(snapshot-name-fmt)`; \ - old="$(tag-prefix)$(tar-name)-$(snapshot-name)"; \ new="$(tag-prefix)$(tar-name)-$$name"; \ cvs -Q rtag $(if $(on-branch),-r $(glibc-base),-D "$$now") $$new libc;\ (echo '# This file is updated automatically by Makefile.'; \ @@ -34,7 +33,8 @@ update: echo "$(glibc-branch)-sync-date := $$now"; \ echo "$(glibc-branch)-sync-tag := $$new"; \ ) > branch.mk; \ - cd ..; (set -x; cvs -q update -d -P -j"$$old" -j"$$new") \ + cd ..; (set -x; cvs -q update -d -P \ + -j'$($(glibc-branch)-sync-tag)' -j"$$new") \ 2>&1 | tee fedora/update.log commit-merge: diff --git a/fedora/branch.mk b/fedora/branch.mk index 1bc627c1c1..91d751ff05 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -2,4 +2,4 @@ glibc-branch := fedora glibc-base := HEAD fedora-sync-date := 2004-09-22 05:52 UTC -fedora-sync-tag := fedora-glibc-20040922T0552 +fedora-sync-tag := fedora-base |