pimhwang
/
spreed-webrtc
mirror of https://github.com/strukturag/spreed-webrtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

No longer install config file in install target to avoid issues with non root installs.

pull/168/head
Simon Eisenmann 11 years ago
parent
a1a74f9070
commit
2ccd200de7
1 changed files with 3 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      Makefile.am

9
Makefile.am
Unescape View File

@ -30,7 +30,6 @@ GOTESTFLAGS ?=
BIN ?= @prefix@/sbin BIN ?= @prefix@/sbin
SHARE ?= @prefix@/share/spreed-webrtc-server SHARE ?= @prefix@/share/spreed-webrtc-server
CONFIG_DIR ?= $(CONFIG_PATH)
OUTPUT := $(CURDIR)/bin OUTPUT := $(CURDIR)/bin
OUTPUT_JS := $(CURDIR)/build/out OUTPUT_JS := $(CURDIR)/build/out
@ -120,8 +119,7 @@ release: $(DIST_BIN) binary releaseassets
install: install:
@echo "Installing binaries to: $(BIN)" @echo "Installing binaries to: $(BIN)"
@echo "Installing static resources to: $(SHARE)" @echo "Installing static resources to: $(SHARE)"
@echo "Installing config file to: $(CONFIG_DIR)" $(INSTALL) -d $(BIN)
$(INSTALL) -d $(BIN) $(CONFIG_DIR)
$(INSTALL) -d $(SHARE)/www/html $(INSTALL) -d $(SHARE)/www/html
$(INSTALL) -d $(SHARE)/www/static $(INSTALL) -d $(SHARE)/www/static
$(INSTALL) -d $(SHARE)/www/static/img $(INSTALL) -d $(SHARE)/www/static/img
@ -131,7 +129,6 @@ install:
$(INSTALL) -d $(SHARE)/www/static/css $(INSTALL) -d $(SHARE)/www/static/css
$(INSTALL) -d $(SHARE)/www/static/js/libs/pdf $(INSTALL) -d $(SHARE)/www/static/js/libs/pdf
$(INSTALL) bin/$(EXENAME) $(BIN) $(INSTALL) bin/$(EXENAME) $(BIN)
$(INSTALL) -m 644 server.conf.in $(CONFIG_DIR)/$(CONFIG_FILE)
$(INSTALL) html/* $(SHARE)/www/html $(INSTALL) html/* $(SHARE)/www/html
$(INSTALL) static/img/* $(SHARE)/www/static/img $(INSTALL) static/img/* $(SHARE)/www/static/img
$(INSTALL) static/sounds/* $(SHARE)/www/static/sounds $(INSTALL) static/sounds/* $(SHARE)/www/static/sounds
@ -166,11 +163,11 @@ $(DIST_BIN):
tarball: TARPATH = $(DIST)/$(PACKAGE_NAME)-$(PACKAGE_VERSION) tarball: TARPATH = $(DIST)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
tarball: BIN = $(TARPATH)/loader tarball: BIN = $(TARPATH)/loader
tarball: CONFIG_DIR = $(TARPATH)/loader tarball: DOCS = $(TARPATH)/loader/docs
tarball: DOCS = $(CONFIG_DIR)/docs
tarball: SHARE = $(TARPATH)/ tarball: SHARE = $(TARPATH)/
tarball: distclean release install tarball: distclean release install
echo -n $(PACKAGE_VERSION) > $(TARPATH)/version.txt echo -n $(PACKAGE_VERSION) > $(TARPATH)/version.txt
cp server.conf.in $(TARPATH)/loader
tar czf $(DIST)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)_$(BUILD_OS)_$(BUILD_ARCH).tar.gz -C $(DIST) $(PACKAGE_NAME)-$(PACKAGE_VERSION) tar czf $(DIST)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)_$(BUILD_OS)_$(BUILD_ARCH).tar.gz -C $(DIST) $(PACKAGE_NAME)-$(PACKAGE_VERSION)
.PHONY: clean distclean vendorclean pristine get getupdate build javascript fonts styles release releasetest dist_gopath install gopath binary binaryrace binaryall tarball assets .PHONY: clean distclean vendorclean pristine get getupdate build javascript fonts styles release releasetest dist_gopath install gopath binary binaryrace binaryall tarball assets

Write Preview
Loading…
Cancel
Save