diff options
| author |  Henrik Brautaset Aronsen <subsurface@henrik.synth.no> | 2013-02-09 10:36:02 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-02-09 09:44:51 -0800 |
| commit | eb7acc1d96a3aa627f1a0e882445e804f5d12d49 (patch) | |
| tree | e40686aacf19f94129a16b1d2cb61df2c5df6abc | |
| parent | fe87ed182ed5150518ed498adee3e511662b84e0 (diff) | |
| download | subsurface-eb7acc1d96a3aa627f1a0e882445e804f5d12d49.tar.gz | |
Add XSLT support for the macosx install and bundle targets
Works like it should for the install-macosx target. I haven't tested
the create-macosx-bundle target, but it shouldn't be any different.
Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | macos.c | 5 |
2 files changed, 14 insertions, 0 deletions
@@ -190,6 +190,11 @@ install-macosx: $(NAME) $(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources/$$LOC; \ $(INSTALL) $$LOC/subsurface.mo $(MACOSXINSTALL)/Contents/Resources/$$LOC/subsurface.mo; \ done + @-if test ! -z "$(XSLT)"; then \ + $(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources/xslt; \ + $(INSTALL) -m 644 $(XSLTFILES) $(MACOSXINSTALL)/Contents/Resources/xslt/; \ + fi + create-macosx-bundle: $(NAME) $(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources @@ -203,6 +208,10 @@ create-macosx-bundle: $(NAME) $(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources/$$LOC; \ $(INSTALL) $$LOC/subsurface.mo $(MACOSXSTAGING)/Contents/Resources/$$LOC/subsurface.mo; \ done + @-if test ! -z "$(XSLT)"; then \ + $(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources/xslt; \ + $(INSTALL) -m 644 $(XSLTFILES) $(MACOSXSTAGING)/Contents/Resources/xslt/; \ + fi $(GTK_MAC_BUNDLER) packaging/macosx/subsurface.bundle install-cross-windows: $(NAME) @@ -1,5 +1,6 @@ /* macos.c */ /* implements Mac OS X specific functions */ +#include <stdlib.h> #include "dive.h" #include "display-gtk.h" #include <CoreFoundation/CoreFoundation.h> @@ -172,6 +173,10 @@ void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar, GtkWidget *vbox, GtkUIManager *ui_manager) { GtkWidget *menu_item, *sep; + static char path[1024]; + + snprintf(path, 1024, "%s/xslt", gtkosx_application_get_resource_path()); + setenv("SUBSURFACE_XSLT_PATH", path, TRUE); g_object_set(G_OBJECT(settings), "gtk-font-name", UI_FONT, NULL); |