Garst's patch for the off-by-two problem

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d921ef3af1a39b2af0ad7d59a10563cba2d6570f..40b2c4d2b93e8b0ec7fcc3a94adc95abaee0b79d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,7 @@
 include $(top_srcdir)/config/common.am
 
-DISTCLEANFILES += -r lyx.1 config.status config.cache config.log \
-       $(srcdir)/sourcedoc/*~ \
-       $(srcdir)/sourcedoc/html $(srcdir)/sourcedoc/latex \
-       $(srcdir)/sourcedoc/man $(srcdir)/sourcedoc/Doxyfile
+DISTCLEANFILES += lyx.1 config.status config.cache config.log \
+       $(srcdir)/sourcedoc/*~ $(srcdir)/sourcedoc/Doxyfile
 
 MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
        $(srcdir)/configure $(srcdir)/development/lyx.spec \
@@ -15,6 +13,9 @@ EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
        UPGRADING lyx.man acconfig.h autogen.sh \
        development images sourcedoc
 
+# Hack so that the targets that use tar will also work with automake 1.4
+AMTAR ?= $(TAR)
+
 man_MANS = lyx.1
 
 ## Needed by bindist
@@ -59,6 +60,10 @@ doxydoc: sourcedoc/Doxyfile
        cd sourcedoc; \
        doxygen ./Doxyfile
 
+distclean-local:
+       rm -rf $(srcdir)/sourcedoc/html $(srcdir)/sourcedoc/latex \
+       $(srcdir)/sourcedoc/main
+
 lgbtags:
        etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*