From 50139890b5e1b42640df4688c4866327e5f0521f Mon Sep 17 00:00:00 2001 From: Andreas Romeyke <andreas.romeyke@slub-dresden.de> Date: Fri, 4 Feb 2022 17:39:38 +0100 Subject: [PATCH] - minor fix in target $(BUILD) --- Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 48069c3..b5e63a4 100644 --- a/Makefile +++ b/Makefile @@ -13,14 +13,15 @@ ROSETTASDK=/exlibris/dps/d4_1/system.dir/dps-sdk-${ROSETTAVERSION}/lib/ ROSETTASDKDEPOSIT=${ROSETTASDK}/../dps-sdk-projects/dps-sdk-deposit/lib ROSETTASDKPLUGINS=${ROSETTASDK}/../../bundled_plugins/ -XALAN_JAR=$(shell find /usr/share/java/ -name "xalan2.jar" ) -XERCES_JAR=$(shell find /usr/share/java/ -name "xercesImpl.jar") -XML_JAR=$(shell find /usr/share/java/ -name "xml-apis.jar") + +#XALAN_JAR=$(shell find /usr/share/java/ -name "xalan2.jar" ) +#XERCES_JAR=$(shell find /usr/share/java/ -name "xercesImpl.jar") +#XML_JAR=$(shell find /usr/share/java/ -name "xml-apis.jar") # classpath JUNITCLASSPATH=/usr/share/java/junit4.jar #SOURCESCLASSPATH=org/slub/rosetta/dps/repository/plugin/storage/nfs -CLASSPATH=./java:${ROSETTASDKDEPOSIT}/../src/:${ROSETTASDKDEPOSIT}/xmlbeans-2.3.0.jar:${ROSETTASDKDEPOSIT}/dps-sdk-${ROSETTAVERSION}.jar:${ROSETTASDKDEPOSIT}/log4j-1.2.14.jar:/usr/share/java/commons-lang.jar +CLASSPATH=./java:${ROSETTASDKDEPOSIT}/../src/:${ROSETTASDKDEPOSIT}/xmlbeans-2.3.0.jar:${ROSETTASDKDEPOSIT}/dps-sdk-${ROSETTAVERSION}.jar:${ROSETTASDKDEPOSIT}/log4j-1.2.14.jar:/usr/share/java/commons-lang.jar:${ROSETTASDKDEPOSIT}/xalan-2.7.0.jar #BUILDPATH=$(CLASSPATH) # sources @@ -55,6 +56,7 @@ distclean: clean $(BUILD): @mkdir $(BUILD); + @mkdir $(BUILD)/lib $(JAR): $(OBJS) @cp -r PLUGIN-INF/ $(BUILD) @@ -62,7 +64,7 @@ $(JAR): $(OBJS) @cd java; find ./ -name "*.class" -print -exec cp --parents -r \{\} $(PWD)/$(BUILD) \; ; cd .. # @cd resources; find ./ -type f -print -exec cp --parents -r \{\} $(PWD)/build \; ; cd .. cp -a resources/ $(PWD)/$(BUILD) - mkdir $(BUILD)/lib + ifdef XALAN_JAR echo "XALAN_JAR: unzip '$(XALAN_JAR)'" # unzip $(XALAN_JAR) '*.class' -d $(BUILD); -- GitLab