From ce659407a8093834eab29b5c030305f8a0d943b0 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 22 Feb 2013 11:20:46 -0800 Subject: Add correct XSLT search path for Windows And report error if XSLT stylesheet not found Signed-off-by: Dirk Hohndel --- Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 91bdbccd1..a8e4d2fef 100644 --- a/Makefile +++ b/Makefile @@ -118,7 +118,6 @@ ifeq ($(UNAME), linux) GCONF2CFLAGS = $(shell $(PKGCONFIG) --cflags gconf-2.0) OSSUPPORT = linux OSSUPPORT_CFLAGS = $(GTKCFLAGS) $(GCONF2CFLAGS) - XSLT_CAPABLE = 1 else ifeq ($(UNAME), darwin) OSSUPPORT = macos OSSUPPORT_CFLAGS = $(GTKCFLAGS) @@ -131,7 +130,6 @@ else ifeq ($(UNAME), darwin) CFLAGS += $(shell $(PKGCONFIG) --cflags gtk-mac-integration) LDFLAGS += -headerpad_max_install_names -sectcreate __TEXT __info_plist $(INFOPLIST) GTK_MAC_BUNDLER = ~/.local/bin/gtk-mac-bundler - XSLT_CAPABLE = 1 else OSSUPPORT = windows OSSUPPORT_CFLAGS = $(GTKCFLAGS) @@ -140,14 +138,11 @@ else NSIINPUTFILE = $(WINDOWSSTAGING)/subsurface.nsi.in NSIFILE = $(WINDOWSSTAGING)/subsurface.nsi MAKENSIS = makensis - + XSLTDIR = .\\xslt endif ifneq ($(strip $(LIBXSLT)),) - # We still need proper paths and install options for OSX and Windows - ifdef XSLT_CAPABLE - XSLT=-DXSLT='"$(XSLTDIR)"' - endif + XSLT=-DXSLT='"$(XSLTDIR)"' endif LIBS = $(LIBXML2) $(LIBXSLT) $(LIBGTK) $(LIBGCONF2) $(LIBDIVECOMPUTER) $(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBOSMGPSMAP) $(LIBSOUP) $(LIBWINSOCK) -- cgit v1.2.3-70-g09d2