Yet more update tweaks.

diff --git a/fedora/Makefile b/fedora/Makefile
index d2529394f6965d57a3f3f63240a3a10f6218c614..b8708e27375bd0d6b0bf6a2bbcabf3f48649540e 100644 (file)
--- 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 1bc627c1c11bc5cb7fcc08595702c24b1fb65f0b..91d751ff0526d98e7628a3f6607d0e145ab18add 100644 (file)
--- 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