From d5b41e91b055604cee1309a002c2d3a538282fd3 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sun, 29 Jun 2014 15:32:53 +0000
Subject: [PATCH] defs.mk: Don't link against systemd without SDK

Only link against systemd if /usr/include/systemd/sd-daemon.h exists.

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/defs.mk |  2 ++
 make/tex.mk  | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index cf55ac7e..ad407905 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -114,7 +114,9 @@ USE_PROJECT_LIB       ?= true
 USE_YTOOLS            ?= true
 USE_EXCEPTIONS_IN_C   ?= true
 REENTRANT             ?= true
+ifneq ($(wildcard /usr/include/systemd/sd-daemon.h),)
 USE_SYSTEMD           ?= true
+endif
 
 export REENTRANT
 
diff --git a/make/tex.mk b/make/tex.mk
index 83b6cc62..0c5e5654 100644
--- a/make/tex.mk
+++ b/make/tex.mk
@@ -36,7 +36,7 @@ TEX_TMPL_BASE_DIR     ?= $(MODDIR)/texdoc
 TEX_TMPL_STYLE        ?= de_technical
 TEX_TMPL_DIR          ?= $(TEX_TMPL_BASE_DIR)/$(TEX_TMPL_STYLE)
 IMPORTED_TEMPLATES    ?= $(shell ls $(TEX_TMPL_DIR)/*.tmpl)
-IMAGEDIR              ?= $(CVSTOPDIR)/images
+WWW_IMAGEDIR          ?= $(CVS_PROJ_DIR)/www-janware/tools/html/htdocs/images
 FRONTLOGO_PDF         ?= logo-janware.pdf
 FRONTLOGO_EPS         ?= janware-frontpage-top-right.png
 FRONTLOGO_WEB         ?= janware-frontpage-top-right.png
@@ -243,9 +243,21 @@ texsrc: $(GENERATED)
 %: %.tmpl
 	$(mangle_tmpl)
 
-$(FRONTLOGO_PDF): $(IMAGEDIR)/$(patsubst %.pdf,%.svg,$(FRONTLOGO_PDF))
+$(FRONTLOGO_PDF): $(WWW_IMAGEDIR)/$(patsubst %.pdf,%.svg,$(FRONTLOGO_PDF))
 	inkscape -w 30mm --export-pdf=$@ $<
 
+%.pdf: %.svg
+	inkscape -w 30mm --export-pdf=$@ $<
+
+$(WWW_IMAGEDIR)/%.svg: %.svg
+	cp $< $@
+
+$(CVS_IMAGEDIR)/%.svg: %.svg
+	cp $< $@
+
+$(CVS_IMAGEDIR)/%.png: %.png
+	cp $< $@
+
 cfgtest.done:
 	test -n "$(OUTPUT)" # OUTPUT
 	test -n "$(DISTDIR)" # DISTDIR
@@ -261,7 +273,7 @@ cfgtest.done:
 	test -n "$(AUTHORS)" # AUTHORS
 	test -n "$(TITLE)" # TITLE
 	test -n "$(SUBTITLE)" # SUBTITLE
-	test -d $(IMAGEDIR) # IMAGEDIR
+	test -d $(WWW_IMAGEDIR) # IMAGEDIR
 	@for IMG in $(IMAGES); do if [ ! -f $$IMG ]; then echo "$$IMG is missing"; exit 1; fi; done
 	test -n "$(VERSION)" # VERSION
 	touch $@