Commit 449f73e4 authored by Sam Hocevar's avatar Sam Hocevar

* Makefile.am:

    + Don't use vlc_app_DATA for the BeOS bundle.
    + Build the BeOS bundle in $(top_builddir).
parent d6f04ffa
...@@ -408,29 +408,29 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin ...@@ -408,29 +408,29 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin
esac esac
if HAVE_BEOS if HAVE_BEOS
vlc_app_DATA = vlc-bundle noinst_lib_DATA = vlc-bundle
vlc-bundle: vlc vlc-bundle: vlc
rm -Rf $(srcdir)/vlc-bundle ; mkdir -p $(srcdir)/vlc-bundle rm -Rf $(top_builddir)/vlc-bundle ; mkdir -p $(top_builddir)/vlc-bundle
cp $(srcdir)/vlc $(srcdir)/vlc-bundle/ cp $(top_builddir)/vlc $(top_builddir)/vlc-bundle/
xres -o $(srcdir)/vlc-bundle/vlc $(srcdir)/share/vlc_beos.rsrc xres -o $(top_builddir)/vlc-bundle/vlc $(srcdir)/share/vlc_beos.rsrc
for i in "" `$(VLC_CONFIG) --target plugin` ; do \ for i in "" `$(VLC_CONFIG) --target plugin` ; do \
if test -n "$$i" ; then \ if test -n "$$i" ; then \
mkdir -p $(srcdir)/vlc-bundle/plugins ; \ mkdir -p $(top_builddir)/vlc-bundle/plugins ; \
cp "$$i$(LIBEXT)" $(srcdir)/vlc-bundle/plugins/ ; \ cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \
fi ; \ fi ; \
done done
if test -d $(srcdir)/extras/contrib/vlc-lib ; then \ if test -d $(top_builddir)/extras/contrib/vlc-lib ; then \
mkdir -p $(srcdir)/vlc-bundle/lib ; \ mkdir -p $(top_builddir)/vlc-bundle/lib ; \
for i in $(srcdir)/extras/contrib/vlc-lib/*.so ; do \ for i in $(top_builddir)/extras/contrib/vlc-lib/*.so ; do \
cp $$i $(srcdir)/vlc-bundle/lib/ ; \ cp $$i $(top_builddir)/vlc-bundle/lib/ ; \
done ; \ done ; \
fi fi
for i in $(ALL_LINGUAS); do \ for i in $(ALL_LINGUAS); do \
mkdir -p "$(srcdir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \ mkdir -p "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \
cp "$(srcdir)/po/$$i.gmo" \ cp "$(top_builddir)/po/$$i.gmo" \
"$(srcdir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \ "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
done done
find $(srcdir)/vlc-bundle -type f -exec mimeset -f "{}" \; find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \;
endif endif
# Install the modules and the symlinks # Install the modules and the symlinks
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment