From 008bb980ec1425b13510bdb49b8fc15ccee63d83 Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Tue, 21 Jul 2009 22:36:41 +0200
Subject: [PATCH] fix Mail install and script install

---
 {scripts/Mail => Mail}/CrossAssassin.pm | 0
 Makefile                                | 4 ++--
 Makefile.PL                             | 2 +-
 debian/debbugs.install                  | 3 +++
 debian/libdebbugs-perl.install          | 4 ++--
 5 files changed, 8 insertions(+), 5 deletions(-)
 rename {scripts/Mail => Mail}/CrossAssassin.pm (100%)

diff --git a/scripts/Mail/CrossAssassin.pm b/Mail/CrossAssassin.pm
similarity index 100%
rename from scripts/Mail/CrossAssassin.pm
rename to Mail/CrossAssassin.pm
diff --git a/Makefile b/Makefile
index 1bb7ef88..df174b82 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)
 
@@ -61,7 +61,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
diff --git a/Makefile.PL b/Makefile.PL
index 06b43cca..0063970e 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -3,7 +3,7 @@
 use ExtUtils::MakeMaker;
 
 WriteMakefile(FIRST_MAKEFILE => 'Makefile.perl',
-	      PMLIBDIRS => ['Debbugs'],
+	      PMLIBDIRS => ['Debbugs','Mail'],
 	      EXE_FILES => ['bin/local-debbugs',
 			    'bin/add_bug_to_estraier',
 			   ],
diff --git a/debian/debbugs.install b/debian/debbugs.install
index 81d29cbe..38ec1f1f 100644
--- a/debian/debbugs.install
+++ b/debian/debbugs.install
@@ -6,3 +6,6 @@ var/lib/debbugs/spool
 var/lib/debbugs/indices
 usr/bin/add_bug_to_estraier
 usr/share/man/man1/add_bug_*
+# there currently isn't a Mail::Crossassassin manpage
+#usr/share/man/man3/Mail*
+usr/share/perl5/Mail*
\ No newline at end of file
diff --git a/debian/libdebbugs-perl.install b/debian/libdebbugs-perl.install
index c4acdfa7..bc1da7ea 100644
--- a/debian/libdebbugs-perl.install
+++ b/debian/libdebbugs-perl.install
@@ -1,3 +1,3 @@
-usr/share/man/man3
-usr/share/perl5
+usr/share/man/man3/Debbugs*
+usr/share/perl5/Debbugs*
 #etc/debbugs/config
-- 
2.39.5