infrastructure for 'graceful asserts'

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7237120f7df97d333a5fa6d2397b292d533bfc6d..828ecb74cab20a068d7a3ad328d07adcf83f2e74 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,47 +23,22 @@ SUBDIRS = config development intl po $(BOOST) src sourcedoc lib \
 
 EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
        INSTALL.Win32 INSTALL.MacOSX INSTALL.scons INSTALL.cmake \
-       README.Win32 README.Cygwin lyx.man autogen.sh
+       README.Win32 README.Cygwin README.localization lyx.man autogen.sh
 
 man_MANS = lyx.1
 
-## Needed by bindist
-bindistdir=$(PWD)/lyxbin
-bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz
-
 lyx.1:
        cp -p $(srcdir)/lyx.man lyx.1
 
 rpmdist: dist
-       $(LN_S) $(srcdir)/lib/images/lyx.xpm . ; \
+       $(LN_S) $(srcdir)/lib/images/lyx.png . ; \
        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:
-       rm -f $(bindistfile)
-       $(MAKE) $(AM_MAKEFLAGS) DESTDIR=$(bindistdir) install-strip
-       if test -f $(top_srcdir)/README.bin ; then \
-         $(INSTALL) $(top_srcdir)/README.bin \
-               $(bindistdir)$(prefix)/README.bin ; \
-       fi
-       (cd $(bindistdir)$(prefix) ; $(AMTAR) cf - . ) | \
-       GZIP=$(GZIP_ENV) gzip > $(bindistfile)
-       -chmod -R a+w $(bindistdir) > /dev/null 2>&1 ; rm -rf $(bindistdir)
-       @if test -f $(top_srcdir)/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."
+       rm lyx.png; exit $$saved_status
 
 doxydoc:
        cd sourcedoc; make doxydoc