From 3407d4312a4bce2ed920ed2438497eb883b24e01 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Tue, 30 Jan 2007 14:41:57 +0000 Subject: [PATCH] Fix subdir handling. Now finally, "make distcheck" will include the documentation into the tarball even if the configure had been run without the --enable-doc. git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk@726 81a1dc3b-b13d-400b-aceb-764788c761c2 --- avrdude/ChangeLog | 6 ++++++ avrdude/configure.ac | 15 +++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/avrdude/ChangeLog b/avrdude/ChangeLog index 1886f28f..f4ee9f42 100644 --- a/avrdude/ChangeLog +++ b/avrdude/ChangeLog @@ -1,3 +1,9 @@ +2007-01-30 Joerg Wunsch + + * configure.ac: Fix subdir handling. Now finally, "make distcheck" will + include the documentation into the tarball even if the configure had been + run without the --enable-doc. + 2007-01-30 Joerg Wunsch * safemode.c: Obtain progname from avrdude.h rather than trying to roll our diff --git a/avrdude/configure.ac b/avrdude/configure.ac index 3f6949f1..646eabf7 100644 --- a/avrdude/configure.ac +++ b/avrdude/configure.ac @@ -163,14 +163,12 @@ AC_ARG_ENABLE( esac], [enabled_parport=yes]) -if test "$enabled_doc" = "yes"; then - -SUBDIRS_AC='doc @WINDOWS_DIRS@' DIST_SUBDIRS_AC='doc windows' -else -SUBDIRS_AC='@WINDOWS_DIRS@' -DIST_SUBDIRS_AC='windows' +if test "$enabled_doc" = "yes"; then + SUBDIRS_AC='doc @WINDOWS_DIRS@' +else + SUBDIRS_AC='@WINDOWS_DIRS@' fi AC_SUBST(DOC_INST_DIR, $DOC_INST_DIR) @@ -250,11 +248,8 @@ if test "$GCC" = yes; then fi AC_SUBST(ENABLE_WARNINGS,$ENABLE_WARNINGS) -if test "$enabled_doc" = "yes"; then -AC_CONFIG_FILES([doc/Makefile]) -fi - AC_CONFIG_FILES([ + doc/Makefile windows/Makefile avrdude.spec Makefile