[Libreoffice-commits] online.git: configure.ac loleaflet/Makefile.am

[Pranav Kant]

 configure.ac          |    2 +-
 loleaflet/Makefile.am |   35 ++++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit 907b391f433983f170901ceac1bb5e5640bf6c6a
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Wed Jan 4 19:38:33 2017 +0530

    dist-hook and install-data-hook for loleaflet
    
    Also tell automake to use tar-pax instead to allow bigger file
    names (> 99).
    
    Change-Id: I1d910a08684e780c958c7edc9852432705d51b18

diff --git a/configure.ac b/configure.ac
index 4b05b56..386fe3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_PREREQ([2.69])
 AC_INIT([loolwsd], [2.0.1+], [libreoffice at lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
-AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
+AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects tar-pax])
 
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index ade8fee..178b827 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -12,8 +12,7 @@ MINIFY=false
 
 EXTRA_DIST = $(shell git ls-files)
 
-.PHONY: build
-build: node_modules
+all-local: node_modules
 	rm -rf dist/plugins/draw-$(DRAW_VERSION) && mkdir -p dist/plugins/draw-$(DRAW_VERSION)
 	cd plugins/draw-$(DRAW_VERSION) && jake build && cp -ar dist ../../dist/plugins/draw-$(DRAW_VERSION)
 	jake build debug=$(ENABLE_DEBUG) minify=$(MINIFY)
@@ -24,25 +23,27 @@ node_modules: npm-shrinkwrap.json
 
 .PHONY: build-l10n
 build-l10n:
-	mkdir -p dist/l10n/styles
-
 	util/po2json.py --quiet po/*.po
-	mv po/*.json dist/l10n/
 	util/po2json.py --quiet po/styles/*.po
+
+.PHONY: move-l10n-to-dist
+move-l10n-to-dist:
+	mv po/*.json dist/l10n/
 	mv po/styles/*.json dist/l10n/styles/
 
-all-local: build
-
-.PHONY: dist
-dist: MINIFY=true
-dist: all build-l10n
-	rm -rf loleaflet-$(VERSION)
-	mkdir loleaflet-$(VERSION)
-	cp -ar dist loleaflet-$(VERSION)
-	mkdir -p loleaflet-$(VERSION)/dist/node_modules/jquery-ui/themes/ui-lightness/images/
-	cp -a node_modules/jquery-ui/themes/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png loleaflet-$(VERSION)/dist/node_modules/jquery-ui/themes/ui-lightness/images/
-	tar cfz loleaflet-$(VERSION).tar.gz loleaflet-$(VERSION)
-	rm -rf loleaflet-$(VERSION)
+install-data-hook:
+	mkdir -p $(DESTDIR)$(pkgdatadir)/loleaflet; \
+	cp -ar dist/ $(DESTDIR)$(pkgdatadir)/loleaflet/;
+
+dist-hook: build-l10n
+	chmod u+w $(distdir)/dist
+
+	mkdir -p $(distdir)/dist/l10n/styles
+	mv po/*.json $(distdir)/dist/l10n/
+	mv po/styles/*.json $(distdir)/dist/l10n/styles/
+
+	mkdir -p $(distdir)/dist/node_modules/jquery-ui/themes/ui-lightness/images/
+	cp -a node_modules/jquery-ui/themes/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png $(distdir)/dist/node_modules/jquery-ui/themes/ui-lightness/images/
 
 pot:
 	xgettext --from-code=UTF-8 --keyword=_ --output=po/templates/loleaflet-ui.pot \