Renames and jDo

[fanfix.git] / Makefile.base

diff --git a/Makefile.base b/Makefile.base
index 9901644035cee9e0610447751befe4b1e28cb7cc..e44b5d52cd5a6d09e2a6c2cad323f4aa92f24a39 100644 (file)
--- a/Makefile.base
+++ b/Makefile.base
@@ -94,6 +94,7 @@ resources: libs
                        cp "$$ln" "../bin/$$ln" ; \
                fi ; \
        done
+       @cp VERSION bin/
 
 test-resources: resources
        @echo Copying test resources into bin/...
@@ -107,9 +108,11 @@ test-resources: resources
 
 libs: bin
        @[ -e bin/libs -o ! -d libs ] || echo Extracting sources from libs...
-       @[ -e bin/libs -o ! -d libs ] || (cd src && for lib in ../libs/*-sources.jar; do \
-               basename "$$lib"; \
-               jar xf "$$lib"; \
+       @[ -e bin/libs -o ! -d libs ] || (cd src && for lib in ../libs/*-sources.jar ../libs/*-sources.patch.jar; do \
+               if [ "$$lib" != '../libs/*-sources.jar' -a "$$lib" != '../libs/*-sources.patch.jar' ]; then \
+                       basename "$$lib"; \
+                       jar xf "$$lib"; \
+               fi \
        done )
        @[ ! -d libs ] || touch bin/libs