Fix resource bundle bug, is now 1.6+ only

[nikiroo-utils.git] / Makefile.base

diff --git a/Makefile.base b/Makefile.base
index 9ae14f8833d037ed48f55515953d00037b222260..559b89d9020a53df2b6212600233c68cd88841a2 100644 (file)
--- a/Makefile.base
+++ b/Makefile.base
@@ -9,7 +9,7 @@
 #SJAR_FLAGS += a list of things to pack, each usually prefixed with "-C src/", for *-sources.jar files
 
 JAVAC = javac
-JAVAC_FLAGS += -encoding UTF-8 -d ./bin/ -cp ./src/ -Xdiags:verbose
+JAVAC_FLAGS += -encoding UTF-8 -d ./bin/ -cp ./src/
 JAVA = java
 JAVA_FLAGS += -cp ./bin/
 JAR = jar
@@ -77,6 +77,9 @@ mrproper: mrpropre
 
 mrpropre: clean
        rm -f $(NAME).jar
+       rm -f $(NAME)-sources.jar
+       [ ! -e VERSION ] || rm -f "$(NAME)-`cat VERSION`.jar"
+       [ ! -e VERSION ] || rm -f "$(NAME)-`cat VERSION`-sources.jar"
 
 love:
        @echo " ...not war."
@@ -139,6 +142,6 @@ install:
        mkdir -p "$(PREFIX)/lib" "$(PREFIX)/bin"
        cp $(NAME).jar "$(PREFIX)/lib/"
        echo "#!/bin/sh" > "$(PREFIX)/bin/$(NAME)"
-       echo "$(RJAR) $(RJAR_FLAGS) \"$(PREFIX)/lib/$(NAME).jar\" \"$$@\"" >> "$(PREFIX)/bin/$(NAME)"
+       echo "$(RJAR) $(RJAR_FLAGS) \"$(PREFIX)/lib/$(NAME).jar\" \"\$$@\"" >> "$(PREFIX)/bin/$(NAME)"
        chmod a+rx "$(PREFIX)/bin/$(NAME)"