treat favicon.ico like a normal image

diff --git a/Makefile b/Makefile
index e375ae7..f1f19bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ thirdparty-js:
 thirdparty-css:
        @find $(THIRD-PARTY-RESOURCES) -name '*.css'
 thirdparty-img:
 thirdparty-css:
        @find $(THIRD-PARTY-RESOURCES) -name '*.css'
 thirdparty-img:

-       @find $(THIRD-PARTY-RESOURCES) -name '*.png'
+       @find $(THIRD-PARTY-RESOURCES) -name '*.png' -o -name '*.ico'

 
 # we might have any of these as templates - e.g. ./unfold/templates/plugin-init.js
 # so if there's a /templates/ in the path ignore the file
 
 # we might have any of these as templates - e.g. ./unfold/templates/plugin-init.js
 # so if there's a /templates/ in the path ignore the file


@@ -49,7 +49,7 @@ local-js: force
 local-css: force
        @find . -type f -name '*.css' | egrep -v 'all-(static|templates)/|/third-party/|/templates/'
 local-img: force
 local-css: force
        @find . -type f -name '*.css' | egrep -v 'all-(static|templates)/|/third-party/|/templates/'
 local-img: force

-       @find . -type f -name '*.png' | egrep -v 'all-(static|templates)/|/third-party/|/templates/'
+       @find . -type f -name '*.png' -o -name '*.ico' | egrep -v 'all-(static|templates)/|/third-party/|/templates/'

 
 list-js: thirdparty-js local-js
 list-css: thirdparty-css local-css
 
 list-js: thirdparty-js local-js
 list-css: thirdparty-css local-css

diff --git a/setup.py b/setup.py
index e767a3d..d6b487e 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -19,6 +19,5 @@ setup(packages = packages,
         ( 'all-static/css', glob ('all-static/css/*')),
         ( 'all-static/img', glob ('all-static/img/*')),
         ( 'all-templates', glob ('all-templates/*')),
         ( 'all-static/css', glob ('all-static/css/*')),
         ( 'all-static/img', glob ('all-static/img/*')),
         ( 'all-templates', glob ('all-templates/*')),

-        ( 'all-static', ['apache/favicon.ico', ] ),

         ( 'apache', [ 'apache/myslice.conf', 'apache/myslice.wsgi' ]),
         ])
         ( 'apache', [ 'apache/myslice.conf', 'apache/myslice.wsgi' ]),
         ])

diff --git a/apache/favicon.ico b/views/img/favicon.ico
similarity index 100%
rename from apache/favicon.ico
rename to views/img/favicon.ico