diff options
author | Mark Wielaard <mark@klomp.org> | 2006-01-23 21:35:41 +0000 |
---|---|---|
committer | Mark Wielaard <mark@klomp.org> | 2006-01-23 21:35:41 +0000 |
commit | ef603bd3c1cdf9eb189c6243ec12e94a58c499c3 (patch) | |
tree | b5a626ed03e8ad8a9c42fe7b842bb04d7e012828 | |
parent | 82c97f2fbc99dea9a1f59e9ce5772ca0a9a86087 (diff) | |
download | classpath-ef603bd3c1cdf9eb189c6243ec12e94a58c499c3.tar.gz |
* examples/Makefile.am (EXAMPLE_ZIP): Group cd and commands.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | examples/Makefile.am | 8 |
2 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,7 @@ +2006-01-23 Mark Wielaard <mark@klomp.org> + + * examples/Makefile.am (EXAMPLE_ZIP): Group cd and commands. + 2006-01-23 Tom Tromey <tromey@redhat.com> * gnu/java/security/x509/X509Certificate.java (parse): diff --git a/examples/Makefile.am b/examples/Makefile.am index 6cf7ad22b..bf427ee41 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -95,10 +95,10 @@ $(EXAMPLE_ZIP): $(EXAMPLE_JAVA_FILES) 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) |