Kolab Groupware OBS

Changes of Revision 121

debian.rules Changed

@@ -30,7 +30,7 @@
 	lessc -x ./skins/elastic/styles/embed.less > ./skins/elastic/styles/embed.css
 
 	# Compress the CSS
-	for file in `find $(CURDIR) -type f -name "*.css"`; do \
+	for file in `find $(CURDIR)/ ! -path $(CURDIR)/public_html/assets/ -type f -name "*.css"`; do \
 		asset_loc=$$(dirname $$(echo $${file} | sed \
 				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
 				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
@@ -43,7 +43,7 @@
 	done
 
 	# Compress the JS, but not the already minified
-	for file in `find $(CURDIR)/ -type f -name "*.js" ! -name "*.min.js"`; do \
+	for file in `find $(CURDIR)/ ! -path $(CURDIR)/public_html/assets/ -type f -name "*.js" ! -name "*.min.js"`; do \
 		asset_loc=$$(dirname $$(echo $${file} | sed \
 				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
 				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
@@ -56,7 +56,7 @@
 	done
 
 	# The already minied JS can just be copied over to the assets location
-	for file in `find $(CURDIR)/ ! -path $(CURDIR)/public_html/ -type f -name "*.min.js"`; do \
+	for file in `find $(CURDIR)/ ! -path $(CURDIR)/public_html/assets/ -type f -name "*.min.js"`; do \
 		asset_loc=$$(dirname $$(echo $${file} | sed \
 				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
 				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
@@ -68,6 +68,7 @@
 
 	# Other assets
 	for file in $$(find $(CURDIR)/plugins/ $(CURDIR)/program/ $(CURDIR)/skins/ -type f \
+			! -path $(CURDIR)/public_html/assets/ \
 			-name "*.eot" -o \
 			-name "*.gif" -o \
 			-name "*.ico" -o \