X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Makefile;h=8114d0bc4baea08251e7b0285ea1cc1972827727;hb=747a1435ec35ebac24e9e321e6b3b4afcc2bea7b;hp=587670406b9eb7578055036259ac1741152e58e5;hpb=7d96d08af28cfc7a0619146d9b232d6b7ced0cf7;p=debbugs.git

diff --git a/Makefile b/Makefile
index 5876704..8114d0b 100644
--- a/Makefile
+++ b/Makefile
@@ -24,21 +24,23 @@ install_exec	:= install -m755 -p
 install_data	:= install -m644 -p
 
 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
 
 test:
-	$(PERL) -MTest::Harness -I. -e 'runtests(glob(q(t/*.t)))'
+	LC_ALL=$(UTF8_LOCALE) $(PERL) -MTest::Harness -I. -e 'runtests(glob(q(t/*.t)))'
 
 test_%: t/%.t
-	$(PERL) -MTest::Harness -I. -e 'runtests(q($<))'
+	LC_ALL=$(UTF8_LOCALE) $(PERL) -MTest::Harness -I. -e 'runtests(q($<))'
 
 testcover:
-	PERLLIB=t/cover_lib/ cover -test
+	LC_ALL=$(UTF8_LOCALE) PERL5LIB=t/cover_lib/:. cover -test
 
 clean:
 	if [ -e Makefile.perl ]; then \
@@ -47,15 +49,14 @@ 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 README.md debian/README.mail $(doc_dir)
+	$(MAKE) -f Makefile.perl install DESTDIR=$(DESTDIR)
 
 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
@@ -71,8 +72,8 @@ $(var_dir)/spool/db-h $(scripts_dir) $(examples_dir) $(man8_dir); \
 	$(install_data) scripts/errorlib $(scripts_dir)/errorlib
 
 	# install examples
-	$(install_data) scripts/config $(examples_dir)/config
-	$(install_data) scripts/config.debian $(examples_dir)/config.debian
+	$(install_data) examples/config $(examples_dir)/config
+	$(install_data) examples/config.debian $(examples_dir)/config.debian
 	$(install_data) scripts/text $(examples_dir)/text
 	$(install_data) debian/crontab misc/nextnumber misc/Maintainers \
 	  misc/Maintainers.override misc/pseudo-packages.description \
@@ -82,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