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

Split "install" target into binary and assets. 

This way packaging can later move the static assets to a separate package.
pull/266/head
Joachim Bauch 9 years ago
parent
fe3c4ffaeb
commit
75fb049883
1 changed files with 8 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      Makefile.am

12
Makefile.am
Unescape View File

@ -123,10 +123,13 @@ release: INTERNALLDFLAGS = -X main.version $(PACKAGE_VERSION) -X main.defaultCon @@ -123,10 +123,13 @@ release: INTERNALLDFLAGS = -X main.version $(PACKAGE_VERSION) -X main.defaultCon
release: OUTPUT = $(DIST_BIN)
release: $(DIST_BIN) binary releaseassets
install:
install-binary:
@echo "Installing binaries to: $(DESTDIR)$(BIN)"
@echo "Installing static resources to: $(DESTDIR)$(SHARE)"
$(INSTALL) -d $(DESTDIR)$(BIN)
$(INSTALL) bin/$(EXENAME) $(DESTDIR)$(BIN)
install-assets:
@echo "Installing static resources to: $(DESTDIR)$(SHARE)"
$(INSTALL) -d $(DESTDIR)$(SHARE)/www/html
$(INSTALL) -d $(DESTDIR)$(SHARE)/www/html/sandboxes
$(INSTALL) -d $(DESTDIR)$(SHARE)/www/static
@ -137,7 +140,6 @@ install: @@ -137,7 +140,6 @@ install:
$(INSTALL) -d $(DESTDIR)$(SHARE)/www/static/css
$(INSTALL) -d $(DESTDIR)$(SHARE)/www/static/js/libs/pdf
$(INSTALL) -d $(DESTDIR)$(SHARE)/www/static/js/sandboxes
$(INSTALL) bin/$(EXENAME) $(DESTDIR)$(BIN)
$(INSTALL) html/*.html $(DESTDIR)$(SHARE)/www/html
$(INSTALL) html/sandboxes/*.html $(DESTDIR)$(SHARE)/www/html/sandboxes
$(INSTALL) static/img/* $(DESTDIR)$(SHARE)/www/static/img
@ -151,6 +153,8 @@ install: @@ -151,6 +153,8 @@ install:
$(INSTALL) -D static/js/libs/webodf.js $(DESTDIR)$(SHARE)/www/static/js/libs/webodf.js
$(INSTALL) $(OUTPUT_JS)/sandboxes/*.js $(DESTDIR)$(SHARE)/www/static/js/sandboxes
install: install-binary install-assets
clean:
$(GO) clean -i -r app/... 2>/dev/null || true
rm -rf $(CURDIR)/static/fonts
@ -181,4 +185,4 @@ tarball: distclean release install @@ -181,4 +185,4 @@ tarball: distclean release install
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)
.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 install-binary install-assets gopath binary binaryrace binaryall tarball assets

Write Preview
Loading…
Cancel
Save