remove ant references on --enable-java-bindings, say users to run mvn

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4a06b1e43a9fd497159ddf65f56d859071a6f1db..498d5cd776bff64b8d422229877d5c74c0c77525 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -313,10 +313,10 @@ qvlc: make-alias
 nvlc: make-alias
        $(MKALIAS) ncurses
 
-#noinst_SCRIPTS = vlc
+noinst_SCRIPTS = vlc$(EXEEXT)
 
 vlc$(EXEEXT): core
-       rm -f vlc
+       rm -f vlc$(EXEEXT)
        ln -s src/vlc$(EXEEXT)
 #      rm -f -- vlc vlc.tmp
 #      echo '#! /bin/sh' > vlc.tmp
@@ -570,7 +570,7 @@ VLC.app: vlc
                  $(top_builddir)/VLC.app
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
-       $(INSTALL) $(top_builddir)/.libs/vlc \
+       $(INSTALL) $(top_builddir)/src/.libs/vlc \
                   $(top_builddir)/VLC.app/Contents/MacOS/VLC
        ln -sf ./VLC $(top_builddir)/VLC.app/Contents/MacOS/clivlc
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
@@ -611,7 +611,7 @@ package-win-common:
        fi
 
 # Copy relevant files
-       cp "$(top_builddir)/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/"
+       cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/"
        cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(top_builddir)/vlc-$(VERSION)/"
        cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-$(VERSION)/"
        cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-$(VERSION)/"
@@ -619,8 +619,8 @@ package-win-common:
        for file in AUTHORS MAINTAINERS THANKS ; \
          do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-$(VERSION)/$${file}.txt" ; done;
        for file in NEWS COPYING README; \
-          do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done
-         unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt
+         do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done
+       unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt
 
        mkdir $(top_builddir)/vlc-$(VERSION)/locale
        cat $(top_srcdir)/po/LINGUAS | while read i; do \