Minor language changes only

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2f77f41a6fa1e720d1a0e48b470ee3f660b26d9c..a617a46aac2d5fd9f4dafb9c8fef5ec17c5994bf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,13 @@
 include $(top_srcdir)/config/common.am
 
+ACLOCAL_AMFLAGS = -I m4 -I config
+
 DISTCLEANFILES += lyx.1 config.status config.cache config.log
 
 MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
-       $(srcdir)/configure \
-       $(srcdir)/acinclude.m4
+       $(srcdir)/configure
 
-DIST_SUBDIRS = config development intl po boost src sourcedoc lib
+DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
 
 if USE_INCLUDED_BOOST
 SUBDIRS = config development intl po boost src sourcedoc lib
@@ -14,11 +15,9 @@ else
 SUBDIRS = config development intl po src sourcedoc lib
 endif
 
-EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
-       UPGRADING lyx.man autogen.sh images
-
-# 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
 
@@ -29,12 +28,8 @@ 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 $(srcdir)/lib/images/lyx.xpm . ; \
+       $(LN_S) $(srcdir)/lib/images/lyx.xpm . ; \
        if [ -z "`type -path rpmbuild`" ]; \
        then \
                RPMBUILD=rpm; \
@@ -71,3 +66,4 @@ lgbtags:
        etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
 
 .PHONY: doxydoc
+