From 3b6ddd9ae2903ff0894a2d8e0683cc1e16232dee Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Thu, 10 Nov 2016 10:55:41 +0100 Subject: [PATCH 1/3] Don't use "install -D" which behaves differently on FreeBSD. --- Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6d288d33..6842463c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -163,6 +163,7 @@ install-assets: $(INSTALL) -d $(DESTDIR)$(SHARE)/www/static/translation $(INSTALL) -d $(DESTDIR)$(SHARE)/www/static/css $(INSTALL) -d $(DESTDIR)$(SHARE)/www/static/js/libs/pdf + $(INSTALL) -d $(DESTDIR)$(SHARE)/www/static/js/libs/require $(INSTALL) -d $(DESTDIR)$(SHARE)/www/static/js/sandboxes $(INSTALL) html/*.html $(DESTDIR)$(SHARE)/www/html $(INSTALL) html/sandboxes/*.html $(DESTDIR)$(SHARE)/www/html/sandboxes @@ -171,10 +172,10 @@ install-assets: $(INSTALL) static/fonts/* $(DESTDIR)$(SHARE)/www/static/fonts $(INSTALL) static/translation/* $(DESTDIR)$(SHARE)/www/static/translation $(INSTALL) static/css/* $(DESTDIR)$(SHARE)/www/static/css - $(INSTALL) -D static/js/libs/require/require.js $(DESTDIR)$(SHARE)/www/static/js/libs/require/require.js + $(INSTALL) static/js/libs/require/require.js $(DESTDIR)$(SHARE)/www/static/js/libs/require $(INSTALL) $(OUTPUT_JS)/*.js $(DESTDIR)$(SHARE)/www/static/js $(INSTALL) $(OUTPUT_JS)/libs/pdf/*.js $(DESTDIR)$(SHARE)/www/static/js/libs/pdf - $(INSTALL) -D static/js/libs/webodf.js $(DESTDIR)$(SHARE)/www/static/js/libs/webodf.js + $(INSTALL) static/js/libs/webodf.js $(DESTDIR)$(SHARE)/www/static/js/libs $(INSTALL) $(OUTPUT_JS)/sandboxes/*.js $(DESTDIR)$(SHARE)/www/static/js/sandboxes install: install-binary install-assets From 01da72c7e130d19aebdb54e1f391455675228296 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Thu, 10 Nov 2016 10:58:05 +0100 Subject: [PATCH 2/3] Added note about using "gmake" instead of "make" on FreeBSD. --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index b46eeb0a..8b0a3e33 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,9 @@ $ ./configure $ make ``` +On FreeBSD, the default `make` has a different syntax, so `gmake` must be used +there. + ## Build separately From ee6f974f112e68ff5ec5e46e2d592f802b2363b8 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Thu, 10 Nov 2016 10:59:02 +0100 Subject: [PATCH 3/3] Added note about needing "git" for building. This is required to fetch the Go dependencies. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8b0a3e33..24015624 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ The latest source of Spreed WebRTC can be found on [GitHub](https://github.com/s - [NodeJS](http://nodejs.org/) >= 0.6.0 - [autoconf](http://www.gnu.org/software/autoconf/) - [automake](http://www.gnu.org/software/automake/) + - [git](https://git-scm.com/) ## Runtime dependencies