fix squeeze build issues

5 files changed, 5 insertions, 35 deletions

diff --git a/Makefile.in b/Makefile.in
index 4028778..028e9f1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -487,10 +487,6 @@ BUILTINS_LIB = -lbuiltins
 BUILTINS_LDFLAGS = -L$(DEFDIR)
 BUILTINS_DEP = $(BUILTINS_LIBRARY)
 
-# Documentation for the shell.
-DOCSRC = $(srcdir)/doc
-DOCDIR = $(dot)/doc
-
 # Translations and other i18n support files
 PO_SRC = $(srcdir)/po/
 PO_DIR = $(dot)/po/
@@ -508,7 +504,7 @@ CREATED_SUPPORT = signames.h recho$(EXEEXT) zecho$(EXEEXT) printenv$(EXEEXT) \
 		  buildversion.o mksignames.o signames.o buildsignames.o
 CREATED_CONFIGURE = config.h config.cache config.status config.log \
 		    stamp-h po/POTFILES
-CREATED_MAKEFILES = Makefile builtins/Makefile doc/Makefile \
+CREATED_MAKEFILES = Makefile builtins/Makefile \
 		    lib/readline/Makefile lib/glob/Makefile \
 		    lib/sh/Makefile lib/tilde/Makefile lib/malloc/Makefile \
 		    lib/termcap/Makefile examples/loadables/Makefile \
@@ -695,10 +691,8 @@ reconfig: force
 #	$(MAKE) -f $(srcdir)/Makefile $(MFLAGS) srcdir=$(srcdir)
 
 doc documentation:  force
-	@(cd $(DOCDIR) ; $(MAKE) $(MFLAGS) )
 
 info dvi ps: force
-	@(cd $(DOCDIR) ; $(MAKE) $(MFLAGS) CFLAGS='$(CCFLAGS)' $@ )
 
 force:
 
@@ -733,7 +727,6 @@ basic-clean:
 	$(RM) .build .made version.h 
 
 clean:	basic-clean
-	( cd $(DOCDIR) && $(MAKE) $(MFLAGS) $@ )
 	( cd builtins && $(MAKE) $(MFLAGS) $@ )
 	-( cd $(SDIR) && $(MAKE) $(MFLAGS) $@ )
 	-for libdir in ${LIB_SUBDIRS}; do \
@@ -743,7 +736,6 @@ clean:	basic-clean
 	$(RM) $(CREATED_SUPPORT)
 
 mostlyclean: basic-clean
-	( cd $(DOCDIR) && $(MAKE) $(MFLAGS) $@ )
 	( cd builtins && $(MAKE) $(MFLAGS) $@ )
 	-( cd $(SDIR) && $(MAKE) $(MFLAGS) $@ )
 	-for libdir in ${LIB_SUBDIRS}; do \
@@ -752,7 +744,6 @@ mostlyclean: basic-clean
 	-( cd $(PO_DIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
 
 distclean:	basic-clean maybe-clean
-	( cd $(DOCDIR) && $(MAKE) $(MFLAGS) $@ )
 	( cd builtins && $(MAKE) $(MFLAGS) $@ )
 	-( cd $(SDIR) && $(MAKE) $(MFLAGS) $@ )
 	-for libdir in ${LIB_SUBDIRS}; do \
@@ -766,7 +757,6 @@ maintainer-clean:	basic-clean
 	@echo This command is intended for maintainers to use.
 	@echo It deletes files that may require special tools to rebuild.
 	$(RM) y.tab.c y.tab.h parser-built tags TAGS
-	( cd $(DOCDIR) && $(MAKE) $(MFLAGS) $@ )
 	( cd builtins && $(MAKE) $(MFLAGS) $@ )
 	( cd $(SDIR) && $(MAKE) $(MFLAGS) $@ )
 	-for libdir in ${LIB_SUBDIRS}; do \
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 5efa3fe..88da9e4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,8 @@ Section: base
 Priority: optional
 Maintainer: Vyatta Package Maintainers <maintainers@vyatta.com>
 Standards-Version: 3.6.2
-Build-Depends: autoconf, patch, bison, libncurses5-dev, texinfo, autotools-dev, 
-	       debhelper (>= 4.1), texi2html, locales
-Build-Depends-Indep: tetex-bin
+Build-Depends: autoconf, patch, bison, libncurses5-dev, autotools-dev,
+ debhelper (>= 5), locales
 
 Package: vyatta-bash
 Architecture: any
diff --git a/lib/glob/Makefile.in b/lib/glob/Makefile.in
index 9f53a7b..a25b7bb 100644
--- a/lib/glob/Makefile.in
+++ b/lib/glob/Makefile.in
@@ -74,12 +74,6 @@ HSOURCES = $(srcdir)/strmatch.h
 
 OBJECTS = glob.o strmatch.o smatch.o xmbsrtowcs.o
 
-# The texinfo files which document this library.
-DOCSOURCE = doc/glob.texi
-DOCOBJECT = doc/glob.dvi
-DOCSUPPORT = doc/Makefile
-DOCUMENTATION = $(DOCSOURCE) $(DOCOBJECT) $(DOCSUPPORT)
-
 SUPPORT = Makefile ChangeLog $(DOCSUPPORT)
 
 SOURCES  = $(CSOURCES) $(HSOURCES) $(DOCSOURCE)
@@ -101,7 +95,7 @@ what-tar:
 	done
 
 documentation: force
-	-(cd doc; $(MAKE) $(MFLAGS))
+
 force:
 
 # The rule for 'includes' is written funny so that the if statement
@@ -111,14 +105,11 @@ install:
 
 clean:
 	rm -f $(OBJECTS) $(LIBRARY_NAME)
-	-(cd doc && $(MAKE) $(MFLAGS) $@ )
 
 realclean distclean maintainer-clean: clean
-	-( cd doc && $(MAKE) $(MFLAGS) $@ )
 	$(RM) -f Makefile
 
 mostlyclean: clean
-	-( cd doc && $(MAKE) $(MFLAGS) $@ )
 
 ######################################################################
 #								     #
diff --git a/lib/readline/Makefile.in b/lib/readline/Makefile.in
index 98169e4..5ab97b8 100644
--- a/lib/readline/Makefile.in
+++ b/lib/readline/Makefile.in
@@ -98,12 +98,6 @@ OBJECTS = readline.o vi_mode.o funmap.o keymaps.o parens.o search.o \
 	  util.o kill.o undo.o macro.o input.o callback.o terminal.o \
 	  text.o nls.o misc.o $(HISTOBJ) $(TILDEOBJ) xmalloc.o compat.o
 
-# The texinfo files which document this library.
-DOCSOURCE = doc/rlman.texinfo doc/rltech.texinfo doc/rluser.texinfo
-DOCOBJECT = doc/readline.dvi
-DOCSUPPORT = doc/Makefile
-DOCUMENTATION = $(DOCSOURCE) $(DOCOBJECT) $(DOCSUPPORT)
-
 SUPPORT = Makefile ChangeLog $(DOCSUPPORT) examples/[-a-z.]*
 
 SOURCES  = $(CSOURCES) $(HSOURCES) $(DOCSOURCE)
@@ -129,7 +123,6 @@ libhistory.a: $(HISTOBJ) xmalloc.o
 
 documentation: force
 	test -d doc || mkdir doc
-	-( cd doc && $(MAKE) $(MFLAGS) )
 
 # Since tilde.c is shared between readline and bash, make sure we compile
 # it with the right flags when it's built as part of readline
@@ -153,13 +146,10 @@ tags:	force
 
 clean:	force
 	$(RM) $(OBJECTS) *.a
-	-( cd doc && $(MAKE) $(MFLAGS) $@ )
 
 mostlyclean: clean
-	-( cd doc && $(MAKE) $(MFLAGS) $@ )
 
 distclean maintainer-clean: clean
-	-( cd doc && $(MAKE) $(MFLAGS) $@ )
 	$(RM) Makefile
 	$(RM) TAGS tags