Don't make the $prefix/share/gnucash/gnome link on OSX_QUARTZ

The directory it links to isn't there and that creates a code signing problem on OS X 10.11.
Gnucash · Jan 9, 2016 · f8a0108 · f8a0108
1 parent 7a25e2a
commit f8a0108
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
@@ -258,7 +258,7 @@ SCM_FILE_LINKS = \
   ${gncscm_DATA}
 endif
 
-.scm-links: 
+.scm-links:
 	$(RM) -rf gnucash
 	mkdir -p  gnucash
 if GNUCASH_SEPARATE_BUILDDIR
@@ -311,8 +311,9 @@ CLEANFILES = \
 
 MAINTAINERCLEANFILES = swig-gnome-utils.c
 
-# FIXME: Symlinking directories only works on non-win32.
+# We want to do this only for the Gnome help tool on Linux and MacPorts.
 if !PLATFORM_WIN32
+if !PLATFORM_OSX_QUARTZ
 #
 # I hate inconsistent standards. Autotools puts help files into
 # ${datadir}/gnome/help/${program} while the gnome2 libraries expect
@@ -324,5 +325,6 @@ install-data-hook:
 uninstall-hook:
 	rm -f ${DESTDIR}${pkgdatadir}/gnome
 endif
+endif
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui\"
diff --git a/src/html/Makefile.am b/src/html/Makefile.am
@@ -74,8 +74,9 @@ EXTRA_DIST = \
 CLEANFILES = $(BUILT_SOURCES) gnucash
 MAINTAINERCLEANFILES = swig-gnc-html.c
 
-# FIXME: Symlinking directories only works on non-win32.
+# We do this only for the gnome help tool on Linux and MacPorts.
 if !PLATFORM_WIN32
+if !PLATFORM_OSX_QUARTZ
 #
 # I hate inconsistent standards. Autotools puts help files into
 # ${datadir}/gnome/help/${program} while the gnome2 libraries expect
@@ -87,5 +88,6 @@ install-data-hook:
 uninstall-hook:
 	rm -f ${DESTDIR}${pkgdatadir}/gnome
 endif
+endif
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.html\"