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/avrdude@726 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
joerg_wunsch 2007-01-30 14:41:57 +00:00
parent 817a1ce552
commit 00bed106a4
2 changed files with 11 additions and 10 deletions

View File

@ -1,3 +1,9 @@
2007-01-30 Joerg Wunsch <j@uriah.heep.sax.de>
* 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 <j@uriah.heep.sax.de> 2007-01-30 Joerg Wunsch <j@uriah.heep.sax.de>
* safemode.c: Obtain progname from avrdude.h rather than trying to roll our * safemode.c: Obtain progname from avrdude.h rather than trying to roll our

View File

@ -163,14 +163,12 @@ AC_ARG_ENABLE(
esac], esac],
[enabled_parport=yes]) [enabled_parport=yes])
if test "$enabled_doc" = "yes"; then
SUBDIRS_AC='doc @WINDOWS_DIRS@'
DIST_SUBDIRS_AC='doc windows' DIST_SUBDIRS_AC='doc windows'
else
if test "$enabled_doc" = "yes"; then
SUBDIRS_AC='doc @WINDOWS_DIRS@'
else
SUBDIRS_AC='@WINDOWS_DIRS@' SUBDIRS_AC='@WINDOWS_DIRS@'
DIST_SUBDIRS_AC='windows'
fi fi
AC_SUBST(DOC_INST_DIR, $DOC_INST_DIR) AC_SUBST(DOC_INST_DIR, $DOC_INST_DIR)
@ -250,11 +248,8 @@ if test "$GCC" = yes; then
fi fi
AC_SUBST(ENABLE_WARNINGS,$ENABLE_WARNINGS) AC_SUBST(ENABLE_WARNINGS,$ENABLE_WARNINGS)
if test "$enabled_doc" = "yes"; then
AC_CONFIG_FILES([doc/Makefile])
fi
AC_CONFIG_FILES([ AC_CONFIG_FILES([
doc/Makefile
windows/Makefile windows/Makefile
avrdude.spec avrdude.spec
Makefile Makefile