Sync with rtems-4-7-branch.

luzidchris · Feb 22, 2007 · 4380436 · 4380436
1 parent b481c8a
commit 4380436
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Makefile.maint b/Makefile.maint
@@ -43,21 +43,21 @@ tag:
 
 # -----------------
 # Different stages of cvs-exporting
-rtems-$(rtems_version)/stamp.export:
+rtems-$(rtems_version)/stamp.export.$(rtems_tag)$(TAG_SUFFIX):
 	rm -rf rtems-$(rtems_version)
 	@cvs -z9 export -d rtems-$(rtems_version) -r $(rtems_tag)$(TAG_SUFFIX) rtems >/dev/null
 	@if ! test -f rtems-$(rtems_version)/VERSION; then \
 	echo "ERROR export failed"; \
 	echo " Did you run 'make -f Makefile.maint tag' ?"; exit1; fi
-	touch rtems-$(rtems_version)/stamp.export
+	echo "$(rtems_tag)$(TAG_SUFFIX)" > rtems-$(rtems_version)/stamp.export.$(rtems_tag)$(TAG_SUFFIX)
 
-rtems-$(rtems_version).tar.bz2: rtems-$(rtems_version)/stamp.autofiles \
+rtems-$(rtems_version)$(TAG_SUFFIX).tar.bz2: rtems-$(rtems_version)/stamp.autofiles \
 	  rtems-$(rtems_version)/excludes \
 	  rtems-$(rtems_version)/TOOL_VERSIONS
 	tar -cj -X rtems-$(rtems_version)/excludes \
-	  -f rtems-$(rtems_version).tar.bz2 rtems-$(rtems_version)
+	  -f rtems-$(rtems_version)$(TAG_SUFFIX).tar.bz2 rtems-$(rtems_version)
 
-rtems-$(rtems_version)/stamp.cleanup: rtems-$(rtems_version)/stamp.export
+rtems-$(rtems_version)/stamp.cleanup: rtems-$(rtems_version)/stamp.export.$(rtems_tag)$(TAG_SUFFIX)
 	find rtems-$(rtems_version) -name .cvsignore -exec rm -f {} \;
 	find rtems-$(rtems_version) -name preinstall.am -exec touch {} \;
 	touch rtems-$(rtems_version)/c/src/librdbg/src/*/*/remdeb*.[hc]
@@ -75,7 +75,7 @@ rtems-$(rtems_version)/excludes: Makefile.maint
 	@echo "autom4te.cache" >> $@
 	@echo "Makefile.maint" >> $@
 
-tarball: rtems-$(rtems_version).tar.bz2
+tarball: rtems-$(rtems_version)$(TAG_SUFFIX).tar.bz2
 
 rtems-$(rtems_version)/TOOL_VERSIONS: Makefile.maint
 	( \