From 6b39edade67fccb3a7d91dc93fc7783822da22ae Mon Sep 17 00:00:00 2001 From: Martin Goik <goik@hdm-stuttgart.de> Date: Sun, 14 Apr 2013 21:45:18 +0200 Subject: [PATCH] log4j.properties from Dbtools sub project moved to head of CLASSPATH --- Doc/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/Makefile b/Doc/Makefile index 8894d202a..1df6f4252 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -10,7 +10,7 @@ PPARAM=\ HIBDEPS=$(shell cd ../ws/eclipse/HibIntro; mvn dependency:build-classpath |grep -v INFO) JDBCDEPS=$(shell cd ../ws/eclipse/Jdbc; mvn dependency:build-classpath |grep -v INFO) -CP:=../ws/eclipse/Jdbc/target/classes:../ws/eclipse/HibIntro/target/classes:../ws/Docbook/Dbtools/target/classes:/usr/share/java/log4j-1.2.jar:${HIBDEPS}:${JDBCDEPS} +CP:=../ws/Docbook/Dbtools/target/classes:../ws/eclipse/Jdbc/target/classes:../ws/eclipse/HibIntro/target/classes:${HIBDEPS}:${JDBCDEPS} BUILDROOT=/tmp #--no changes below this line------------------------------ @@ -39,7 +39,7 @@ ${BUILDNAVI}/index.html ${BUILDNAVI}/printversion.pdf:${SCRIPTBASENAME}.xml /usr/share/xmlmind/bin/convertdoc -p suppress.navigation 1 -p eclipse.plugin.id $(PLUGINID) ${PPARAM} db5.toEclipseHelp ${SCRIPTBASENAME}.convert.answer.xml \ -u $(BUILDNONAVI) mkdir -p Ref/Fig/Generate;rm -f Ref/Fig/Generate/*.tex;\ - /ma/goik/workspace/GoikLectures/bin/stripUnicode.sh resources/Generate/*.tex; mv resources/Generate/*.tex Ref/Fig/Generate + ../bin/stripUnicode.sh resources/Generate/*.tex; mv resources/Generate/*.tex Ref/Fig/Generate cd Ref/Fig;make all /usr/share/xmlmind/bin/convertdoc -p eclipse.plugin.id $(PLUGINID) ${PPARAM} db5.toEclipseHelp ${SCRIPTBASENAME}.convert.answer.xml -u $(BUILDNAVI) perl -i -p -e '$$/=undef;s/\n[ \t]*<!DOCTYPE[^>]+\n[^>]*>$$//m' ${BUILDNAVI}/*.xml ${BUILDNONAVI}/*.xml -- GitLab