diff --git a/Makefile b/Makefile
index 10febce5af4e1f269f0b432a72ed294b0d4b63c9..2741a905597b330238e47630a41b292ceb913e4c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,19 @@
-#!/bin/bash
 # Andreas Romeyke, SLUB Dresden
 # Plugin, welches Matroska/FFv1 via mediaconch validiert
 
 # Pfad zu Java
-JAVAPATH=/usr/lib/jvm/java-1.17.0-openjdk-*/bin/
+JAVAPATH=$(wildcard /usr/lib/jvm/java-1.17.0-openjdk-*/bin/)
 JAVARELEASE=17
 
 # Verwendete Rosetta-Version
 ROSETTAVERSION:=7.3.0
 
 # Pfad zum Rosetta-SDK
-ROSETTASDK=/exlibris/dps/d4_1/system.dir/dps-sdk-${ROSETTAVERSION}/lib/
+ROSETTASDK:=/exlibris/dps/d4_1/system.dir/dps-sdk-${ROSETTAVERSION}/lib/
 # Pfad zum Rosetta-SDK, Deposit-Module
 ROSETTASDKDEPOSIT:=${ROSETTASDK}/../dps-sdk-projects/dps-sdk-deposit/lib
 ROSETTASDKPLUGINS:=${ROSETTASDK}/../../bundled_plugins/
-
+ROSETTASDKJARS=$(shell find ${ROSETTASDKDEPOSIT} -name "*.jar")
 
 # classpath
 JUNITCLASSPATH:=/usr/share/java/junit4.jar
@@ -53,8 +52,8 @@ distclean: clean
 	@rm -Rf null
 
 $(BUILD):
-	@mkdir $(BUILD);
-	@mkdir $(BUILD)/lib
+	@mkdir $@;
+	@mkdir $@/lib
 
 $(JAR): $(OBJS)
 	@cp -r PLUGIN-INF/ $(BUILD)