diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-02-22 11:20:46 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-02-22 11:20:46 -0800 |
| commit | ce659407a8093834eab29b5c030305f8a0d943b0 (patch) | |
| tree | 4e76114cfdb052d7d7b4702e7620ab628e28095a /Makefile | |
| parent | 28aba5a2062cd8310f3f637e9572fe3a92d41dfd (diff) | |
| download | subsurface-ce659407a8093834eab29b5c030305f8a0d943b0.tar.gz | |
Add correct XSLT search path for Windows
And report error if XSLT stylesheet not found
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -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) |