X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Makefile;h=b3e46a6be7e1e88601d7ab3f56aba13ba981b099;hb=HEAD;hp=3e48fc1fc28d45926a35493f2fa115d935532d3e;hpb=abb4f72db0baf9bc9fa01664ca4f45b17d47fadf;p=debbugs.git

diff --git a/Makefile b/Makefile
index 3e48fc1..b3e46a6 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,6 @@ sbin_dir	:= $(DESTDIR)/usr/sbin
 etc_dir		:= $(DESTDIR)/etc/debbugs
 var_dir		:= $(DESTDIR)/var/lib/debbugs
 scripts_dir	:= $(DESTDIR)/usr/lib/debbugs
-perl_dir	:= $(DESTDIR)/usr/share/perl5/Debbugs
 doc_dir		:= $(DESTDIR)/usr/share/doc/debbugs
 templates_dir	:= $(DESTDIR)/usr/share/debbugs/templates
 man_dir		:= $(DESTDIR)/usr/share/man
@@ -14,11 +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)
-
-# We use the Makefile.PL to install these; not totally decided if we
-# should switch entirely to this model.
-#perls		:= $(shell find Debbugs -type f -iname '*.pm')
+cgis		:= $(wildcard cgi/*.cgi)
 
 install_exec	:= install -m755 -p
 install_data	:= install -m644 -p
@@ -27,17 +22,18 @@ PERL ?= /usr/bin/perl
 # Some tests need to run under an UTF-8 locale.
 UTF8_LOCALE ?= C.UTF-8
 
-all: build test
+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
@@ -49,10 +45,8 @@ clean:
 
 install: install_mostfiles
 	# install basic debbugs documentation
-	$(install_data) COPYING UPGRADE README debian/README.mail $(doc_dir)
-
-	# configure debbugs
-	$(sbin_dir)/debbugsconfig
+	$(install_data) COPYING UPGRADE.md README.md debian/README.mail $(doc_dir)
+	$(MAKE) -f Makefile.perl install DESTDIR=$(DESTDIR)
 
 install_mostfiles:
 	# create the directories if they aren't there
@@ -62,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);)
@@ -86,15 +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 Perl modules
-#	for perl in $(perls); do $(install_data) $$perl $(perl_dir); done
-	# Make documentation for the perl modules
-
 
 	# install debbugsconfig
 	$(install_exec) debian/debbugsconfig $(sbin_dir)