typos

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c345445fd3c87501d939516b53acb3bebbe59774..8416b56b1d6cd1b57e34f467880ca2b5aa516bfe 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,13 +6,17 @@ MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
        $(srcdir)/configure \
        $(srcdir)/acinclude.m4
 
-SUBDIRS = config development intl po boost src sourcedoc lib
+DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
 
-EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
-       UPGRADING lyx.man autogen.sh images
+if USE_INCLUDED_BOOST
+SUBDIRS = config development intl po boost src sourcedoc lib
+else
+SUBDIRS = config development intl po src sourcedoc lib
+endif
 
-# Hack so that the targets that use tar will also work with automake 1.4
-AMTAR ?= $(TAR)
+EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
+       INSTALL.Win32 INSTALL.MacOSX INSTALL.scons README.Win32 README.Cygwin \
+       lyx.man autogen.sh
 
 man_MANS = lyx.1
 
@@ -23,13 +27,14 @@ bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz
 lyx.1:
        cp -p $(srcdir)/lyx.man lyx.1
 
-dist-hook:
-       cd $(distdir) ; \
-       rm -rf `find images -name \*CVS\*`
-
 rpmdist: dist
-       ln -s lib/images/lyx.xpm . ; \
-       rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz ; saved_status=$$?; \
+       $(LN_S) $(srcdir)/lib/images/lyx.xpm . ; \
+       if [ -z "`type -path rpmbuild`" ]; \
+       then \
+               RPMBUILD=rpm; \
+       else \
+               RPMBUILD=rpmbuild; \
+       fi; $$RPMBUILD -ta $(PACKAGE)-$(VERSION).tar.gz ; saved_status=$$?; \
        rm lyx.xpm; exit $$saved_status
 
 bindist:
@@ -60,3 +65,5 @@ lgbtags:
        etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
 
 .PHONY: doxydoc
+
+ACLOCAL_AMFLAGS = -I m4