remove more functions from MathIterator to prepare merger with text-ed

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c345445fd3c87501d939516b53acb3bebbe59774..2f77f41a6fa1e720d1a0e48b470ee3f660b26d9c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,13 @@ MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
        $(srcdir)/configure \
        $(srcdir)/acinclude.m4
 
+DIST_SUBDIRS = config development intl po boost src sourcedoc lib
+
+if USE_INCLUDED_BOOST
 SUBDIRS = config development intl po boost src sourcedoc lib
+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
@@ -28,8 +34,13 @@ dist-hook:
        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: