diff --git a/Makefile b/Makefile
index 3c51479698c414d5469af5fdf059ad6d2bbb01d6..7e78f546904e118ac85cbdb9022a7b9bf14ba56a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,23 @@
-#!/bin/bash
 # Andreas Romeyke, SLUB Dresden
 # Plugin, welches TIFFs via checkit_tiff 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
-#SOURCESCLASSPATH=org/slub/rosetta/dps/repository/plugin/storage/nfs
+JUNITCLASSPATH:=/usr/share/java/junit4.jar:$(shell find ${ROSETTASDKDEPOSIT} -name "*.jar" -print |xargs echo |sed -e "s/ /:/g")
 CLASSPATH:=${ROSETTASDKDEPOSIT}/dps-sdk-${ROSETTAVERSION}.jar
-#BUILDPATH=$(CLASSPATH)
 
 # sources
 SOURCES:=java/org/slub/rosetta/dps/repository/plugin/SLUBRetroMonographieTIFFFormatValidationPlugin.java
@@ -53,8 +50,8 @@ distclean: clean
 	@rm -Rf null
 
 $(BUILD):
-	@mkdir $(BUILD);
-	@mkdir $(BUILD)/lib
+	@mkdir $@;
+	@mkdir $@/lib
 
 $(JAR): $(OBJS)
 	@cp -r PLUGIN-INF/ $(BUILD)