X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=75ade4d09fb3ed018793883ae8c12d029712d90f;hb=077ea832b5f42e53e48fd2e350bd0e232ff67727;hp=795b8b2de9089c5a414b0384bb5f91a9ab507957;hpb=ee3e9f6fe87ebccb99f5e4c83dc19f5c1cc28071;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index 795b8b2de9..75ade4d09f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,20 @@
 AUTOMAKE_OPTIONS = foreign
 DISTCLEANFILES= *.orig *.rej *~ *.bak lyx.1 core
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure development/lyx.spec
-SUBDIRS = intl po src lib
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/aclocal.m4 \
+	$(srcdir)/configure $(srcdir)/development/lyx.spec \
+	$(srcdir)/acinclude.m4
+SUBDIRS = intl po sigc++ src lib
 
-EXTRA_DIST = ANNOUNCE CHANGES INSTALL.OS2 INSTALL.autoconf README.OS2 \
-	UPGRADING WHATSNEW acconfig.h lyx.man \
+EXTRA_DIST = ANNOUNCE OLD-CHANGES INSTALL.OS2 INSTALL.autoconf README.OS2 \
+	UPGRADING lyx.man acconfig.h \
 	config development forms images
-ETAGS_ARGS = --c++
+ETAGS_ARGS = --lang=c++
 man_MANS = lyx.1
+
+## Needed by bindist
+bindistdir=lyxbin
+bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz
+
 lyx.1:
 	cp -p $(srcdir)/lyx.man lyx.1
 
@@ -18,6 +25,27 @@ dist-hook:
 	rm -rf `find images -name \*CVS\*`
 
 rpmdist: dist
-	ln -s images/lyx.xpm . ; \
-	rpm -ta ${PACKAGE}-${VERSION}.tar.gz ; \
-	rm lyx.xpm
\ No newline at end of file
+	ln -s lib/images/lyx.xpm . ; \
+	rpm -ta ${PACKAGE}-${VERSION}.tar.gz ; saved_status=$$?; \
+	rm lyx.xpm; exit $$saved_status
+
+
+bindist:
+	mkdir $(bindistdir)
+	if test -f README.bin ; then \
+	  $(INSTALL) README.bin  $(bindistdir)/README.bin ; \
+	fi 
+	$(MAKE) $(AM_MAKEFLAGS) install-strip prefix=`pwd`/$(bindistdir)
+	(cd $(bindistdir) ; tar cf - .) | gzip >$(bindistfile)
+	rm -rf $(bindistdir)
+	@if test -f README.bin ; then \
+	  echo "*** Did you remember to check the contents of README.bin?" ; \
+	else \
+	  echo "*** WARNING: You did not provide a README.bin file." ; \
+	  echo "*** Please make one now from the example file" ; \
+	  echo "***   development/tools/README.bin.example" ; \
+	fi  
+	@echo "*** It should mention any problem concerning your binary"
+	@echo "*** distribution and refer to *you* in case of problem."
+	@echo "*** $(bindistfile) has been created."
+