Don't print strange-looking "Usertags are now: ." message when removing all usertags.

[debbugs.git] / Makefile

diff --git a/Makefile b/Makefile
index 63cb917dea98e6f93a131876b9a8d07edf70e12d..b3e46a6be7e1e88601d7ab3f56aba13ba981b099 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,12 +27,13 @@ all: build
 build:
        $(PERL) Makefile.PL
        $(MAKE) -f Makefile.perl
+       $(MAKE) -C html/logo
 
 test:
-       LC_ALL=$(UTF8_LOCALE) $(PERL) -MTest::Harness -I. -e 'runtests(glob(q(t/*.t)))'
+       LC_ALL=$(UTF8_LOCALE) $(PERL) -MTest::Harness -Ilib -e 'runtests(glob(q(t/*.t)))'
 
 test_%: t/%.t
-       LC_ALL=$(UTF8_LOCALE) $(PERL) -MTest::Harness -I. -e 'runtests(q($<))'
+       LC_ALL=$(UTF8_LOCALE) $(PERL) -MTest::Harness -Ilib -e 'runtests(q($<))'
 
 testcover:
        LC_ALL=$(UTF8_LOCALE) PERL5LIB=t/cover_lib/:. cover -test
@@ -44,7 +45,7 @@ clean:
 
 install: install_mostfiles
        # install basic debbugs documentation
-       $(install_data) COPYING UPGRADE README.md debian/README.mail $(doc_dir)
+       $(install_data) COPYING UPGRADE.md README.md debian/README.mail $(doc_dir)
        $(MAKE) -f Makefile.perl install DESTDIR=$(DESTDIR)
 
 install_mostfiles:
@@ -55,12 +56,6 @@ $(var_dir)/www/css \
 $(var_dir)/spool/lock $(var_dir)/spool/archive $(var_dir)/spool/incoming \
 $(var_dir)/spool/db-h $(scripts_dir) $(examples_dir) $(man8_dir); \
           do test -d $$dir || $(install_exec) -d $$dir; done
-# we shouldn't ship db-h spool directories
-       # make db-h spool dirs if they don't exist
-#      cd $(var_dir)/spool/db-h; \
-#        for dir in $(shell seq -w 00 99); \
-#          do test -d $$dir || $(install_exec) -d $$dir; done
-
 
        # install the scripts
        $(foreach script,$(scripts_in), $(install_exec) scripts/$(script) $(scripts_dir);)
@@ -79,6 +74,7 @@ $(var_dir)/spool/db-h $(scripts_dir) $(examples_dir) $(man8_dir); \
        $(foreach html, $(htmls_in), $(install_data) $(html) $(etc_dir)/html;)
        $(install_data) html/htaccess $(var_dir)/www/db/.htaccess
        $(install_data) html/bugs.css $(var_dir)/www/css/bugs.css
+       $(install_data) html/logo/debbugs_logo_icon.png $(var_dir)/www/favicon.png
 
        # install the CGIs
        for cgi in $(cgis); do $(install_exec) $$cgi $(var_dir)/www/cgi; done