X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=2f77f41a6fa1e720d1a0e48b470ee3f660b26d9c;hb=95ced6f5094ef3b0d6cb272727c81d28fee77a20;hp=c345445fd3c87501d939516b53acb3bebbe59774;hpb=f2a5086aef76a86fedf7d1ec966d0b46a98b447d;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index c345445fd3..2f77f41a6f 100644
--- 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: