X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Makefile;h=b3e46a6be7e1e88601d7ab3f56aba13ba981b099;hb=210f625e6e6b4cbe1065f35d9eb0bdc73563969c;hp=86c3235801570f327d89dfc1c3e34f05cda5e8c0;hpb=4a8a3901bdda419efdabf37c958b6f63e7b10d93;p=debbugs.git

diff --git a/Makefile b/Makefile
index 86c3235..b3e46a6 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,7 @@ examples_dir	:= $(doc_dir)/examples
 
 scripts_in	= $(foreach script, $(filter-out scripts/config% scripts/errorlib scripts/text, $(wildcard scripts/*)),$(patsubst scripts/%,%,$(script)))
 htmls_in	:= $(wildcard html/*.html.in)
-cgis		:= $(wildcard cgi/*.cgi cgi/*.pl)
-
+cgis		:= $(wildcard cgi/*.cgi)
 
 install_exec	:= install -m755 -p
 install_data	:= install -m644 -p
@@ -28,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
@@ -45,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:
@@ -56,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);)
@@ -80,10 +74,10 @@ $(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
-	$(install_exec) cgi/bugs-fetch2.pl $(var_dir)/www/cgi/bugs-fetch2.pl
 
 	# install debbugsconfig
 	$(install_exec) debian/debbugsconfig $(sbin_dir)