Merge branch 'release-0.23'

Author: longsleep

Makefile.am

@@ -32,9 +32,9 @@ DESTDIR ?= /
 OUTPUT := $(CURDIR)/bin
 OUTPUT_JS := $(CURDIR)/build/out
 
-BIN := $(DESTDIR)/usr/sbin
-CONFIG_DIR := $(DESTDIR)/$(CONFIG_PATH)
-SHARE := $(DESTDIR)/usr/share/spreed-webrtc-server
+BIN := $(DESTDIR)@prefix@/sbin
+CONFIG_DIR := $(DESTDIR)@prefix@$(CONFIG_PATH)
+SHARE := $(DESTDIR)@prefix@/share/spreed-webrtc-server
 
 BUILD_ARCH := $(shell $(GO) env GOARCH)
 BUILD_OS := $(shell go env GOOS)
@@ -62,7 +62,7 @@ endif
 getupdate: vendorclean get
 
 binary: get
-	$(GO) build $(GOBUILDFLAGS) -o $(OUTPUT)/$(EXENAME) -ldflags '$(LDFLAGS)' app/$(EXENAME)
+	$(GO) build $(GOBUILDFLAGS) -o bin/$(EXENAME) -ldflags '$(LDFLAGS)' app/$(EXENAME)
 
 binaryrace: GOBUILDFLAGS := $(GOBUILDFLAGS) -race
 binaryrace: binary
@@ -130,7 +130,7 @@ install:
 	$(INSTALL) -d $(SHARE)/www/static/translation
 	$(INSTALL) -d $(SHARE)/www/static/css
 	$(INSTALL) -d $(SHARE)/www/static/js/libs/pdf
-	$(INSTALL) $(DIST_BIN)/* $(BIN)
+	$(INSTALL) bin/$(EXENAME) $(BIN)
 	$(INSTALL) -m 644 server.conf.in $(CONFIG_DIR)/$(CONFIG_FILE)
 	$(INSTALL) html/* $(SHARE)/www/html
 	$(INSTALL) static/img/* $(SHARE)/www/static/img
@@ -147,6 +147,7 @@ clean:
 	$(GO) clean -i -r app/... 2>/dev/null || true
 	rm -rf $(CURDIR)/static/fonts
 	rm -rf $(CURDIR)/build/out
+	rm -f $(CURDIR)/bin/$(EXENAME)
 
 distclean: clean
 	rm -rf $(DIST)

debian/changelog

@@ -1,3 +1,10 @@
+spreed-webrtc-server (0.23.1) precise; urgency=low
+
+  * Fixed strict mode on release compile.
+  * Fixed prefix support of make install.
+
+ -- Simon Eisenmann <[email protected]>  Wed, 10 Dec 2014 14:03:15 +0100
+
 spreed-webrtc-server (0.23.0) precise; urgency=low
 
   * Added support for renegotation in web client (disabled).

static/js/base.js

@@ -19,7 +19,6 @@
  *
  */
 
-"use strict";
 define([ // Helper module to put non dependency base libraries together.
 	'modernizr',
 	'moment',
@@ -33,4 +32,5 @@ define([ // Helper module to put non dependency base libraries together.
 	'rAF',
 	'humanize',
 	'sha',
-	'sjcl'], function() {});
+	'sjcl',
+	'webrtc.adapter'], function() {});