Build debian packages into debian/output, not debian-output

diff --git a/.cvsignore b/.cvsignore
index f7b4c19..ee9babe 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,6 +3,5 @@ ZOOM.bs
 ZOOM.c
 blib
 build-stamp
-debian-output
 install-stamp
 pm_to_blib

diff --git a/Changes b/Changes
index 633440b..3659cc6 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,10 +1,10 @@
-$Id: Changes,v 1.73 2007-11-23 12:04:15 mike Exp $
+$Id: Changes,v 1.74 2007-11-29 16:43:52 mike Exp $
 
 Revision history for Perl extension Net::Z3950::ZOOM.
 
 1.22  (IN PROGRESS)
        - Better Debian packaging: use "make debian" to create new
-         "debian-output" directory containing .deb package file,
+         "debian/output" directory containing .deb package file,
          changes file, etc.
        - Clear up a few warnings in ZOOM.xs
        - Minor documentation improvements.

diff --git a/Makefile.PL b/Makefile.PL
index 2fa3500..9d303a5 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,4 +1,4 @@
-# $Id: Makefile.PL,v 1.25 2007-11-19 12:58:28 mike Exp $
+# $Id: Makefile.PL,v 1.26 2007-11-29 16:43:52 mike Exp $
 
 # Use: perl Makefile.PL OPTIMIZE="-O0 -g -Wdeclaration-after-statement"
 #  or: perl Makefile.PL PREFIX=/home/mike/universe
@@ -63,11 +63,12 @@ __EOT__
     }
 }
 
-sub MY::postamble { "debian: makemakerdflt
+sub MY::postamble { "debian: debian/output
+
+debian/output:
        dpkg-buildpackage -rfakeroot -d
-       rm -rf debian-output
-       mkdir debian-output
-       mv ../libnet-z3950-zoom-perl* debian-output
+       rm -rf debian/output
+       mkdir debian/output
+       mv ../libnet-z3950-zoom-perl* debian/output
 ";
 }
-                                              

diff --git a/debian/.cvsignore b/debian/.cvsignore
index fc98be8..e328fad 100644 (file)
--- a/debian/.cvsignore
+++ b/debian/.cvsignore
@@ -1,3 +1,4 @@
 files
 libnet-z3950-zoom-perl
 libnet-z3950-zoom-perl.substvars
+output