[PATCH] Set a relative XSLT path for Windows builds

Lubomir I. Ivanov neolit123 at gmail.com
Fri Feb 22 10:28:21 PST 2013


From: "Lubomir I. Ivanov" <neolit123 at gmail.com>

We need to override the XSLT path when building for Windows.
"/usr/share/subsurface/xslt" doesn't make much sense unless
one has some sort of a MSYS type enviroment set.

The XSLT path in the installer is ./xslt, so this has to be
the path passed via XSLT=-DXSLT='"$(XSLTDIR)"'

Fixes a bug on Windows where files that require XSLT conversation
were not processed correctly.

Reported-by: Rainer Mohr <mail at divelogs.de>
Signed-off-by: Lubomir I. Ivanov <neolit123 at gmail.com>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 91bdbcc..953cd63 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,7 @@ PRODVERSION_STRING := $(shell $(GET_VERSION) win $(VERSION_STRING) || \
 #
 ifeq ($(CC), i686-w64-mingw32-gcc)
 # ok, we are cross building for Windows
+	XSLTDIR = ./xslt/
 	LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer)
 	LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer)
 	RESFILE = packaging/windows/subsurface.res
-- 
1.7.11.msysgit.0



More information about the subsurface mailing list