X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Makefile;h=19a074bb0abba18683d8e3c56cc5b2028c94b58f;hb=5675f516e72951e15cafa1fa72e1d7ff88bb4d80;hp=1bb7ef88a0c51f09d3146665277bc27a83436ca2;hpb=ce23d0291a7bc8a1cb781cb10ae075263e3fd442;p=debbugs.git

diff --git a/Makefile b/Makefile
index 1bb7ef8..19a074b 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ man_dir		:= $(DESTDIR)/usr/share/man
 man8_dir	:= $(man_dir)/man8
 examples_dir	:= $(doc_dir)/examples
 
-scripts_in	:= $(foreach script, $(filter-out scripts/config scripts/errorlib scripts/text, $(wildcard scripts/*)),$(patsubst scripts/%,%,$(script)))
+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)
 
@@ -31,9 +31,15 @@ build:
 	$(PERL) Makefile.PL
 	$(MAKE) -f Makefile.perl
 
-test: build
+test:
 	$(PERL) -MTest::Harness -I. -e 'runtests(glob(q(t/*.t)))'
 
+test_%: t/%.t
+	$(PERL) -MTest::Harness -I. -e 'runtests(q($<))'
+
+testcover:
+	PERLLIB=t/cover_lib/ cover -test
+
 clean:
 	if [ -e Makefile.perl ]; then \
 		$(MAKE) -f Makefile.perl clean; \
@@ -50,6 +56,7 @@ install_mostfiles:
 	# create the directories if they aren't there
 	for dir in $(sbin_dir) $(etc_dir)/html $(etc_dir)/indices \
 $(var_dir)/indices $(var_dir)/www/cgi $(var_dir)/www/db $(var_dir)/www/txt \
+$(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
@@ -61,7 +68,7 @@ $(var_dir)/spool/db-h $(scripts_dir) $(examples_dir) $(man8_dir); \
 
 
 	# install the scripts
-	$(foreach script,$(scripts_in), $(exec $(install_exec) $(script) $(scripts_dir)/$(script)))
+	$(foreach script,$(scripts_in), $(install_exec) scripts/$(script) $(scripts_dir);)
 	$(install_data) scripts/errorlib $(scripts_dir)/errorlib
 
 	# install examples
@@ -76,7 +83,7 @@ $(var_dir)/spool/db-h $(scripts_dir) $(examples_dir) $(man8_dir); \
 	# install the HTML pages etc
 	$(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/bugs.css
+	$(install_data) html/bugs.css $(var_dir)/www/css/bugs.css
 
 	# install the CGIs
 	for cgi in $(cgis); do $(install_exec) $$cgi $(var_dir)/www/cgi; done
@@ -99,8 +106,8 @@ $(var_dir)/spool/db-h $(scripts_dir) $(examples_dir) $(man8_dir); \
 	$(install_data) misc/updateseqs $(var_dir)/spool
 
 	# install the templates
-	$(foreach dir, $(wildcard templates/*/*), $(exec -d $(install_exec) $(template_dir)/$(patsubst templates/%,%,$(dir))))
-	$(foreach tmpl, $(wildcard templates/*/*/*.tmpl), $(exec $(install_data) $(tmpl) $(template_dir)/$(patsubst templates/%,%,$(tmpl))))
+	$(foreach dir, $(wildcard templates/*/*), $(install_exec) -d $(templates_dir)/$(patsubst templates/%,%,$(dir));)
+	$(foreach tmpl, $(wildcard templates/*/*/*.tmpl), $(install_data) $(tmpl) $(templates_dir)/$(patsubst templates/%,%,$(tmpl));)
 
 
-.PHONY: test build
\ No newline at end of file
+.PHONY: test build