X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Makefile;h=19a074bb0abba18683d8e3c56cc5b2028c94b58f;hb=867420593c939cf9585bd42f558778ad598076b9;hp=015ef957ed9824499b231b2f401f92ce86baeee9;hpb=1da4d2c2037c64eb6614e32e6b83597b7dc02fca;p=debbugs.git

diff --git a/Makefile b/Makefile
index 015ef95..19a074b 100644
--- a/Makefile
+++ b/Makefile
@@ -7,20 +7,43 @@ 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
 man8_dir	:= $(man_dir)/man8
 examples_dir	:= $(doc_dir)/examples
 
-scripts_in	:= $(filter-out scripts/config.in scripts/errorlib.in scripts/text.in, $(wildcard scripts/*.in))
+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)
-perls		:= $(foreach name,Log MIME Mail Packages Versions,Debbugs/$(name).pm)
+
+# 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')
 
 install_exec	:= install -m755 -p
 install_data	:= install -m644 -p
 
+PERL ?= /usr/bin/perl
+
+all: build test
+
+build:
+	$(PERL) Makefile.PL
+	$(MAKE) -f Makefile.perl
+
 test:
-	perl -MTest::Harness -I. -e 'runtests(glob(q(t/*.t)))'
+	$(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; \
+	fi;
 
 install: install_mostfiles
 	# install basic debbugs documentation
@@ -33,23 +56,25 @@ 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) $(perl_dir) $(examples_dir) $(man8_dir); \
+$(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
+#	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) $(script) $(scripts_dir)/$(patsubst scripts/%.in,%,$(script));)
-	$(install_data) scripts/errorlib.in $(scripts_dir)/errorlib
+	$(foreach script,$(scripts_in), $(install_exec) scripts/$(script) $(scripts_dir);)
+	$(install_data) scripts/errorlib $(scripts_dir)/errorlib
 
 	# install examples
-	$(install_data) scripts/config.in $(examples_dir)/config
+	$(install_data) scripts/config $(examples_dir)/config
 	$(install_data) scripts/config.debian $(examples_dir)/config.debian
-	$(install_data) scripts/text.in $(examples_dir)/text
+	$(install_data) scripts/text $(examples_dir)/text
 	$(install_data) debian/crontab misc/nextnumber misc/Maintainers \
 	  misc/Maintainers.override misc/pseudo-packages.description \
 	  misc/sources $(examples_dir)
@@ -58,14 +83,16 @@ $(var_dir)/spool/db-h $(scripts_dir) $(perl_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
-	$(install_exec) cgi/bugs-fetch2.pl.in $(var_dir)/www/cgi/bugs-fetch2.pl
+	$(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 Perl modules
-	for perl in $(perls); do $(install_data) $$perl $(perl_dir); done
 
 	# install debbugsconfig
 	$(install_exec) debian/debbugsconfig $(sbin_dir)
@@ -78,4 +105,9 @@ $(var_dir)/spool/db-h $(scripts_dir) $(perl_dir) $(examples_dir) $(man8_dir); \
 	# install the updateseqs file
 	$(install_data) misc/updateseqs $(var_dir)/spool
 
-.PHONY: test
\ No newline at end of file
+	# install the templates
+	$(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