[PATCH 3/6] Make debian directory an extra directory to include in lame source tarball. This eliminates the need to go into debian directory during builds.

[Andres Mejia]

---
 Makefile.am        |    3 ++-
 configure.in       |    2 +-
 debian/Makefile.am |   21 ---------------------
 3 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 debian/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 24b60f4..ee731bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.am.global
 
 .PHONY: test
 
-SUBDIRS = mpglib libmp3lame frontend Dll debian doc include misc dshow ACM \
+SUBDIRS = mpglib libmp3lame frontend Dll doc include misc dshow ACM \
 	mac macosx vc_solution
 
 CLEANFILES = testcase.new.mp3
@@ -22,6 +22,7 @@ EXTRA_DIST = \
 	STYLEGUIDE \
 	USAGE \
 	configMS.h \
+	debian \
 	lame.bat \
 	lame.spec.in \
 	lame.spec \
diff --git a/configure.in b/configure.in
index 1a73fb6..a7019ac 100644
--- a/configure.in
+++ b/configure.in
@@ -1147,6 +1147,6 @@ AC_SUBST(CPUCCODE)
 
 AC_SUBST(CONFIG_DEFS)
 
-AC_CONFIG_FILES([Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile debian/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile macosx/Makefile macosx/English.lproj/Makefile macosx/LAME.xcodeproj/Makefile vc_solution/Makefile])
+AC_CONFIG_FILES([Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile macosx/Makefile macosx/English.lproj/Makefile macosx/LAME.xcodeproj/Makefile vc_solution/Makefile])
 
 AC_OUTPUT
diff --git a/debian/Makefile.am b/debian/Makefile.am
deleted file mode 100644
index 5add3e5..0000000
--- a/debian/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-## $Id$
-
-include $(top_srcdir)/Makefile.am.global
-
-EXTRA_DIST = \
-	changelog \
-	compat \
-	control \
-	copyright \
-	libmp3lame-dev.docs \
-	libmp3lame-dev.install \
-	libmp3lame0.install \
-	lame.docs \
-	lame.install \
-	lame.manpages \
-	rules \
-	watch
-
-dist-hook:
-	chmod +x $(distdir)/rules
-
-- 
1.7.5.4