Add OSX standalone app license bundle, and arrange for the About page

to link to it.

4 files changed, 10 insertions, 7 deletions

diff --git a/Assistant/Install.hs b/Assistant/Install.hs
index 72a511736..d2bd2c545 100644
--- a/Assistant/Install.hs
+++ b/Assistant/Install.hs
@@ -16,6 +16,9 @@ import Utility.OSX
 
 import System.Posix.Env
 
+standaloneOSXAppBase :: IO (Maybe FilePath)
+standaloneOSXAppBase = getEnv "GIT_ANNEX_OSX_APP_BASE"
+
 {- The OSX git-annex.app does not have an installation process.
  - So when it's run, it needs to set up autostarting of the assistant
  - daemon, as well as writing the programFile, and putting a
@@ -25,11 +28,10 @@ import System.Posix.Env
  - it around, the paths this sets up won't break.
  -}
 ensureInstalled :: IO ()
-ensureInstalled = do
-	e <- getEnv "GIT_ANNEX_OSX_APP_BASE"
-	case e of
-		Nothing -> return ()
-		Just base -> do
+ensureInstalled = go =<< standaloneOSXAppBase
+	where
+		go Nothing = noop
+		go (Just base) = do
 			let program = base ++ "/bin/git-annex"
 			programfile <- programFile
 			createDirectoryIfMissing True (parentDir programfile)
diff --git a/Makefile b/Makefile
index d4ac79e67..005ac70d7 100644
--- a/Makefile
+++ b/Makefile
@@ -147,6 +147,7 @@ osxapp: $(bins)
 	cp git-annex "$(OSXAPP_BASE)/bin/"
 	strip "$(OSXAPP_BASE)/bin/git-annex"
 	ln -sf git-annex "$(OSXAPP_BASE)/bin/git-annex-shell"
+	zcat doc/license/git-annex-osx.app-licences.gz > $(OSXAPP_DEST)/LICENSE
 
 	for bin in $(THIRDPARTY_BINS); do \
 		cp "$$(which "$$bin")" "$(OSXAPP_BASE)/bin/" || echo "$$bin not available; skipping"; \
diff --git a/doc/license.mdwn b/doc/license.mdwn
index 32906c365..837fd8c3b 100644
--- a/doc/license.mdwn
+++ b/doc/license.mdwn
@@ -10,5 +10,5 @@ not include this code, so remains GPLed.
 
 git-annex contains a variety of other code, artwork, etc copyright by
 others, under a variety of licences, including the [[LGPL]], BSD,
-MIT, and Apache 2.0 license. For a detailed overview, and pointers to the
-full licenses of these components, see the COPYRIGHT file in the source.
+MIT, and Apache 2.0 licenses. For details, see
+[this file](http://source.git-annex.branchable.com/?p=source.git;a=blob_plain;f=debian/copyright;hb=HEAD).
diff --git a/doc/license/git-annex-osx.app-licences.gz b/doc/license/git-annex-osx.app-licences.gz
new file mode 100644
index 000000000..aa4923dd5
--- /dev/null
+++ b/doc/license/git-annex-osx.app-licences.gz