Call an update before setting the_locking_inset = 0 as otherwise we

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c919683f5902dd6eb4e3dcec317e61a1e031a67a..7756d429e21b32dca5526e18885b95069eb25063 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,16 +9,19 @@ MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
        $(srcdir)/configure $(srcdir)/development/lyx.spec \
        $(srcdir)/acinclude.m4
 
-SUBDIRS = intl po sigc++ boost src lib
+SUBDIRS = config intl po sigc++ boost src lib
 
 EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
        UPGRADING lyx.man acconfig.h autogen.sh \
-       config development images sourcedoc
+       development images sourcedoc
+
+# Hack so that the targets that use tar will also work with automake 1.4
+AMTAR ?= $(TAR)
 
 man_MANS = lyx.1
 
 ## Needed by bindist
-bindistdir=lyxbin
+bindistdir=$(PWD)/lyxbin
 bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz
 
 lyx.1:
@@ -26,7 +29,6 @@ lyx.1:
 
 dist-hook:
        cd $(distdir) ; \
-       rm -rf `find config -name \*CVS\*` ; \
        rm -rf `find development -name \*CVS\*` ; \
        rm -rf `find images -name \*CVS\*`
 
@@ -35,16 +37,17 @@ rpmdist: dist
        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 ; \
+       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
-       $(MAKE) $(AM_MAKEFLAGS) install-strip prefix=`pwd`/$(bindistdir)
-       (cd $(bindistdir) ; tar cf - .) | gzip >$(bindistfile)
-       rm -rf $(bindistdir)
-       @if test -f README.bin ; then \
+       (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." ; \
@@ -55,7 +58,6 @@ bindist:
        @echo "*** distribution and refer to *you* in case of problem."
        @echo "*** $(bindistfile) has been created."
 
-
 doxydoc: sourcedoc/Doxyfile
        cd sourcedoc; \
        doxygen ./Doxyfile