X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=1778e4ff5a1b11c1304765e6098bc25746087dfa;hb=0cfc9133bb381503f3fb48f824f3ad1e32b4f960;hp=c345445fd3c87501d939516b53acb3bebbe59774;hpb=f2a5086aef76a86fedf7d1ec966d0b46a98b447d;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index c345445fd3..1778e4ff5a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,10 +6,16 @@ MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
 	$(srcdir)/configure \
 	$(srcdir)/acinclude.m4
 
+DIST_SUBDIRS = m4 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
+	UPGRADING lyx.man autogen.sh
 
 # Hack so that the targets that use tar will also work with automake 1.4
 AMTAR ?= $(TAR)
@@ -20,16 +26,50 @@ man_MANS = lyx.1
 bindistdir=$(PWD)/lyxbin
 bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz
 
+dist_noinst_DATA = \
+	images/ChangeLog \
+	images/README \
+	images/ams_arrows.xbm \
+	images/ams_misc.xbm \
+	images/ams_nrel.xbm \
+	images/ams_ops.xbm \
+	images/ams_rel.xbm \
+	images/arrows.xbm \
+	images/bop.xbm \
+	images/brel.xbm \
+	images/deco.xbm \
+	images/deco.xpm \
+	images/delim.xbm \
+	images/delim.xpm \
+	images/delim0.xpm \
+	images/delim1.xpm \
+	images/dots.xbm \
+	images/equation.xpm \
+	images/font.xbm \
+	images/frac.xpm \
+	images/greek.xbm \
+	images/matrix.xpm \
+	images/misc.xbm \
+	images/smallcaps.xpm \
+	images/space.xpm \
+	images/sqrt.xpm \
+	images/style.xbm \
+	images/style.xpm \
+	images/sub.xpm \
+	images/super.xpm \
+	images/varsz.xbm
+
 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 +100,5 @@ lgbtags:
 	etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
 
 .PHONY: doxydoc
+
+ACLOCAL_AMFLAGS = -I m4