[Pkg-javascript-commits] [rainloop] 20/38: Cleaned up Makefile. Fixed stylesheet issues caused by change in ordering.

[Daniel Ring]

This is an automated email from the git hooks/post-receive script.

techwolf-guest pushed a commit to branch master
in repository rainloop.

commit 8ece36913e55b190572ca1bfd7f3e6a0e622dbc6
Author: Techwolf <dring at g33kworld.net>
Date:   Sat May 27 00:45:57 2017 -0700

    Cleaned up Makefile.
    Fixed stylesheet issues caused by change in ordering.
---
 debian/Makefile | 15 +++++++--------
 debian/rules    |  4 ++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/debian/Makefile b/debian/Makefile
index 4556866..7d0f7d8 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -62,17 +62,16 @@ cssSocialCSS = \
 	vendors/fontastic/styles.css \
 	dev/Styles/_social.css
 
-
-.PHONY: cssMainLess
-cssMainLess: $(cssMainLess)
-	lessc --include-path="dev/Styles/:vendors/bootstrap/less/" $< \
+.PHONY: cssMain
+cssMain: $(cssMainCSS)
+	cat $^ \
 	| node_modules/.bin/postcss --use autoprefixer \
 	| sed "s/\.\.\/(img|images|fonts|svg)\//$1/g" \
 	> rainloop/v/0.0.0/static/css/app.css
 
-.PHONY: cssMain
-cssMain: $(cssMainCSS) | cssMainLess
-	cat $^ \
+.PHONY: cssMainLess
+cssMainLess: $(cssMainLess) | cssMain
+	lessc --include-path="dev/Styles/:vendors/bootstrap/less/" $< \
 	| node_modules/.bin/postcss --use autoprefixer \
 	| sed "s/\.\.\/(img|images|fonts|svg)\//$1/g" \
 	>> rainloop/v/0.0.0/static/css/app.css
@@ -85,7 +84,7 @@ cssSocial: $(cssSocialCSS)
 	> rainloop/v/0.0.0/static/css/social.css
 
 .PHONY: cssMainMin
-cssMainMin: | cssMain
+cssMainMin: | cssMainLess
 	cleancss -o rainloop/v/0.0.0/static/css/app.min.css rainloop/v/0.0.0/static/css/app.css
 
 .PHONY: cssSocialMin
diff --git a/debian/rules b/debian/rules
index d24d155..518ed87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,12 +12,12 @@ override_dh_auto_build:
 	rm -rf rainloop/v/0.0.0/app/libraries/phpseclib/
 	rm -rf rainloop/v/0.0.0/app/libraries/Predis/
 	rm -rf rainloop/v/0.0.0/app/libraries/SabreForRainLoop/
-	make -f debian/Makefile
+	make -sf debian/Makefile
 
 override_dh_fixperms:
 	dh_fixperms
 	chown -R www-data:www-data debian/rainloop/var/lib/rainloop
 
 override_dh_auto_clean:
-	make -f debian/Makefile clean
+	make -sf debian/Makefile clean
 	dh_auto_clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/rainloop.git