# HG changeset patch
# User masneyb
# Date 1173751439 0
# Node ID 314c1a72ede56f225144073b1c1ab6f092f2b6e1
# Parent  1808cebed6024d6a9488c79998d18302f76ae703
2007-3-12 Brian Masney <masneyb@gftp.org>

        * docs/Makefile.am - fixes for building the documentation

        * Makefile.am - removed mkinstalldirs from EXTRA_DIST

diff -r 1808cebed602 -r 314c1a72ede5 ChangeLog
--- a/ChangeLog	Tue Mar 13 01:52:50 2007 +0000
+++ b/ChangeLog	Tue Mar 13 02:03:59 2007 +0000
@@ -1,4 +1,8 @@
 2007-3-12 Brian Masney <masneyb@gftp.org>
+	* docs/Makefile.am - fixes for building the documentation
+
+	* Makefile.am - removed mkinstalldirs from EXTRA_DIST
+
 	* lib/* src/* - updated copyright dates
 
 	* docs/sample.gftp/right.xpm docs/sample.gftp/up.xpm
diff -r 1808cebed602 -r 314c1a72ede5 Makefile.am
--- a/Makefile.am	Tue Mar 13 01:52:50 2007 +0000
+++ b/Makefile.am	Tue Mar 13 02:03:59 2007 +0000
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 SUBDIRS= docs lib po src
-EXTRA_DIST= config.rpath mkinstalldirs ChangeLog-old README THANKS TODO \
+EXTRA_DIST= config.rpath ChangeLog-old README THANKS TODO \
  gftp.spec.in debian/changelog debian/compat debian/control debian/copyright \
  debian/gftp-common.dirs debian/gftp-common.docs debian/gftp-common.install \
  debian/gftp-gtk.install debian/gftp-gtk.links debian/gftp-gtk.menu \
diff -r 1808cebed602 -r 314c1a72ede5 docs/Makefile.am
--- a/docs/Makefile.am	Tue Mar 13 01:52:50 2007 +0000
+++ b/docs/Makefile.am	Tue Mar 13 02:03:59 2007 +0000
@@ -12,36 +12,19 @@
 Icons_DATA = gftp.png
 
 html:
-	if HAVE_DOCBOOK
-		if test -w $(srcdir); then \
-			(cd $(srcdir); \
-			db2html -u gftp-faq.sgml); \
-		fi
-	else
-		echo "*** Warning: FAQ not built"
-
-	endif
+	if test -w $(srcdir); then \
+		(cd $(srcdir); \
+		db2html -u gftp-faq.sgml); \
+	fi
 
 pdf:
-	if HAVE_DOCBOOK
-		if test -w $(srcdir); then \
-			(cd $(srcdir); db2pdf gftp-faq.sgml); \
-		fi
-	else
-		echo "*** Warning: FAQ not built"
-	endif
+	if test -w $(srcdir); then \
+		(cd $(srcdir); db2pdf gftp-faq.sgml); \
+	fi
 
 clean:
 	rm -rf gftp-faq gftp-faq.junk gftp-faq.pdf
 
 dist-hook: html
-	if HAVE_DOCBOOK
-		cp $(srcdir)/gftp-faq/gftp-faq.html $(distdir)/../README.html
-		html2text -nobs -o $(distdir)/../README -style pretty $(srcdir)/gftp-faq/gftp-faq.html 
-	else
-		echo "***"
-		echo "*** Warning: FAQ not built"
-		echo "*** DISTRIBUTION IS INCOMPLETE"
-		echo "***"
-	endif
-
+	cp $(srcdir)/gftp-faq/gftp-faq.html $(distdir)/../README.html
+	html2text -nobs -o $(distdir)/../README -style pretty $(srcdir)/gftp-faq/gftp-faq.html