From 6dfa974c326e97e908a05fb49e5ead3d76f2a897 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Wed, 15 Oct 2014 21:02:38 -0700 Subject: [PATCH] only enable osxapp build target on apple systems, clean up configure.ac a tiny bit --- Makefile.am | 4 ++-- configure.ac | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index e6ef188..29ccf9a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -242,7 +242,7 @@ if ENABLE_UPDATE_MIMEDB fi endif -#if OSX_APP +if OSX_APP osxapp: all-recursive install install-recursive $(MKDIR_P) $(datarootdir)/bin $(MKDIR_P) $(datarootdir)/lib @@ -325,5 +325,5 @@ osxapp: all-recursive install install-recursive mv $(datarootdir)/share/games/xboard/themes/conf $(datarootdir)/share/xboard/conf rm -r $(datarootdir)/share/xboard/pixmaps rm -r $(datarootdir)/share/games -#endif +endif diff --git a/configure.ac b/configure.ac index cc9023a..b9b0f40 100644 --- a/configure.ac +++ b/configure.ac @@ -180,13 +180,13 @@ AC_ARG_WITH([gamedatadir], [GAMEDATADIR="$withval"], [GAMEDATADIR='$(datadir)/games/xboard']) -AC_ARG_ENABLE( [update-mimedb], - [AS_HELP_STRING([--disable-update-mimedb],[disable the update-mime-database after install [default=no]])], - [enable_mimedb="no"], - [enable_mimedb="yes"]) +AC_ARG_ENABLE([update-mimedb], + [AS_HELP_STRING([--disable-update-mimedb],[disable the update-mime-database after install [default=no]])], + [enable_mimedb="no"], + [enable_mimedb="yes"]) AC_ARG_ENABLE([osxapp], - [AS_HELP_STRING([--enable-osxapp],[build a OSX app])], + [AS_HELP_STRING([--enable-osxapp],[build a OSX app [default=no]])], [enable_OSXAPP=$withval], [enable_OSXAPP="no"]) @@ -465,7 +465,8 @@ dnl| USE_PTYS=1 dnl| add some libs for OS X *-apple-* ) AC_MSG_WARN([Apple support is experimental, please report any problems to bug-xboard@gnu.org]) - AC_MSG_WARN([Building an OS X app currently relies on some programs such as dylib that we don't test for]) + AC_MSG_WARN([use --enable-osxapp to enable the build target and automatically adjust target directories]) + AC_MSG_WARN([Building an OSX app currently relies on some programs such as dylib that we don't test for]) AC_MSG_WARN([patches welcome ;)]) AC_PATH_PROG(SW_VERS, sw_vers) if test "x$SW_VERS" != "x"; then -- 1.7.0.4