Changeset 542e819 in mainline for release/Makefile

Timestamp:

2012-08-12T09:03:30Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b08e7970

Parents:

bd29f9c9 (diff), 371cb6c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• release/Makefile (modified) (3 diffs)

release/Makefile

@@ -33 +33 @@
 
 PROFILES = amd64 arm32/GXemul arm32/integratorcp arm32/gta02 ia32 \
-    ia64/i460GX ia64/ski mips32/GXemul mips32/msim sparc64/niagara \
+    ia64/i460GX ia64/ski mips32/GXemul mips32/msim ppc32 \
     sparc64/ultra
 
@@ -71 +71 @@
 release: src_rel
         for profile in $(PROFILES); do \
-                $(MAKE) -C $(EXPORT_DIR) clean ; \
+                $(MAKE) -C $(EXPORT_DIR) distclean ; \
                 $(MAKE) -C $(EXPORT_DIR) PROFILE=$$profile ; \
                 $(MAKE) PROFILE=$$profile releasefile ; \
@@ -79 +79 @@
         rm -rf $(EXPORT_DIR)
         mkdir -p $(EXPORT_DIR)
-        $(BZR) export $(EXPORT_DIR)
+        $(BZR) export $(EXPORT_DIR) ../
 
 src_rel $(SRC_ARCHIVE): export