Re: [cp-patches] FYI: Fastjar support

[Mark Wielaard]

On Mon, 2006-01-23 at 14:45 +0100, Mark Wielaard wrote:
> We need a similar change for the examples.zip file.
> 
> 2006-01-23  Mark Wielaard  <address@hidden>
> 
>         * examples/Makefile.am: Add support for fastjar.

Oops builder noticed I broke make distcheck with this.
This correctly generates the examples.zip file in the right location:

2006-01-23  Mark Wielaard  <address@hidden>

        * examples/Makefile.am (EXAMPLE_ZIP): Group cd and commands.

Committed,

Mark

--- examples/Makefile.am        23 Jan 2006 13:46:54 -0000      1.9
+++ examples/Makefile.am        23 Jan 2006 20:59:02 -0000
@@ -95,10 +95,10 @@
        mkdir -p classes/gnu/classpath/examples/icons
        cp $(EXAMPLE_ICONS) classes/gnu/classpath/examples/icons
        $(JCOMPILER) -d classes $(EXAMPLE_JAVA_FILES)
-       cd classes
-       if test "$(ZIP)" != ""; then $(ZIP) -r ../$(EXAMPLE_ZIP) .; fi
-       if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(EXAMPLE_ZIP) .; fi
-       cd ..
+       (cd classes; \
+       if test "$(ZIP)" != ""; then $(ZIP) -r ../$(EXAMPLE_ZIP) .; fi; \
+       if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(EXAMPLE_ZIP) .; fi; 
\
+       cd ..)
        rm -rf classes

 # Zip file be gone! (and make sure the classes are gone too)

signature.asc
Description: This is a digitally signed message part