Anti-dupe and filter bugs fixed

[uguu.git] / Makefile

diff --git a/Makefile b/Makefile
index d3c3d583929bff944ffc1efcf434b627bcb53a68..391362c571ce1ff3d78f16329fc07ab3cbe09659 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,25 +24,26 @@ htmlmin:
 
 installdirs:
        mkdir -p $(DESTDIR)/ $(DESTDIR)/img
+       mkdir -p $(DESTDIR)/ $(DESTDIR)/img/grills
 ifneq (,$(findstring php,$(MODULES)))
-       mkdir -p $(DESTDIR)/classes $(DESTDIR)/includes
+       mkdir -p $(DESTDIR)/includes
 endif
 ifneq (,$(findstring moe,$(MODULES)))
        mkdir -p $(DESTDIR)/moe/{css,fonts,includes,js,login,panel/css/font,panel/css/images,register,templates}
 endif
        
 min-css:
-       $(NODE) $(CURDIR)/node_modules/.bin/cleancss --skip-rebase --O1 specialComments:0 $(CURDIR)/static/css/uguu.css --output $(CURDIR)/build/uguu.min.css
+       $(NODE) $(CURDIR)/node_modules/.bin/cleancss $(CURDIR)/static/css/uguu.css --output $(CURDIR)/build/uguu.min.css
 
 min-js:
        echo "// @source https://github.com/nokonoko/uguu/tree/master/static/js" > $(CURDIR)/build/uguu.min.js 
        echo "// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat" >> $(CURDIR)/build/uguu.min.js
-       $(NODE) $(CURDIR)/node_modules/.bin/uglifyjs  --screw-ie8 ./static/js/app.js >> $(CURDIR)/build/uguu.min.js 
+       $(NODE) $(CURDIR)/node_modules/.bin/uglifyjs ./static/js/app.js >> $(CURDIR)/build/uguu.min.js 
        echo "// @license-end" >> $(CURDIR)/build/uguu.min.js
 
 copy-img:
        cp -v $(CURDIR)/static/img/*.png $(CURDIR)/build/img/
-       cp -v $(CURDIR)/static/img/favicon.ico $(CURDIR)/build/favicon.ico
+       cp -R $(CURDIR)/static/img/grills $(CURDIR)/build/img/
 
 copy-php:
 ifneq ($(wildcard $(CURDIR)/static/php/.),)