Move the methods directory to dselect/methods, so the contents will not

be installed if dselect is not to be built.

ChangeLog

@@ -1,3 +1,11 @@
+2006-02-17  Guillem Jover  <guillem@debian.org>
+
+	* methods/: Move directory to dselect/methods/.
+	* Makefile.am (SUBDIRS): Move methods to ...
+	* dselect/Makefile.am (SUBDIRS): ... here. New variable.
+	* configure.ac (AC_CONFIG_FILES): Rename methods/Makefile to
+	dselect/methods/Makefile.
+
 2006-02-17  Guillem Jover  <guillem@debian.org>
 
 	* configure.ac: Require gettext 0.14.5.

Makefile.am

@@ -15,7 +15,6 @@ SUBDIRS = \
 	utils \
 	scripts \
 	po \
-	methods \
 	origins \
 	man
 

configure.ac

@@ -103,6 +103,7 @@ AC_CONFIG_FILES([ Makefile
 		  dpkg-deb/Makefile
 		  dpkg-split/Makefile
 		  dselect/Makefile
+		  dselect/methods/Makefile
 		  getopt/Makefile
 		  intl/Makefile
 		  lib/Makefile
@@ -116,7 +117,6 @@ AC_CONFIG_FILES([ Makefile
 		  man/pt_BR/Makefile
 		  man/ru/Makefile
 		  man/sv/Makefile
-		  methods/Makefile
 		  origins/Makefile
 		  po/Makefile.in
 		  scripts/Makefile

debian/changelog

@@ -3,6 +3,8 @@ dpkg (1.13.16~) UNRELEASED; urgency=low
   [ Guillem Jover ]
   * Move auxiliary autotools scripts to config/.
   * Require gettext 0.14.5.
+  * Move the methods directory to dselect/methods, so the contents will not
+    be installed if dselect is not to be built.
 
  -- Guillem Jover <guillem@debian.org>  Fri, 17 Feb 2006 03:52:59 +0200
 

dselect/Makefile.am

@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+SUBDIRS = methods
+
 localedir = $(datadir)/locale
 INCLUDES = \
 	-DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \