Commit 58141c3c authored by Damien Fouilleul's avatar Damien Fouilleul

hopefully, this will fix previous commit

parent d2b09db5
...@@ -52,9 +52,8 @@ if HAVE_DARWIN ...@@ -52,9 +52,8 @@ if HAVE_DARWIN
LIBRARIES_libvlc = $(top_builddir)/lib/libvlc.a LIBRARIES_libvlc = $(top_builddir)/lib/libvlc.a
npvlc_DATA = $(noinst_npvlc_DATA) npvlc_DATA = npvlc$(LIBEXT)
noinst_npvlc_DATA = npvlc$(LIBEXT) npvlcdir = $(libdir)
noinst_npvlcdir = $(libdir)
BUNDLE_mozilla = VLC\ Plugin.plugin BUNDLE_mozilla = VLC\ Plugin.plugin
SOURCES_support = support/npmac.cpp SOURCES_support = support/npmac.cpp
...@@ -69,7 +68,7 @@ VLC\ Plugin.plugin: npvlc.rsrc npvlc.dylib ...@@ -69,7 +68,7 @@ VLC\ Plugin.plugin: npvlc.rsrc npvlc.dylib
mkdir -p "./$@/Contents/MacOS" mkdir -p "./$@/Contents/MacOS"
cp npvlc.dylib "./$@/Contents/MacOS/$@" cp npvlc.dylib "./$@/Contents/MacOS/$@"
mkdir -p ./"$@"/Contents/Resources mkdir -p ./"$@"/Contents/Resources
cp npvlc.rsrc "./$@/Contents/MacOS/$@.rsrc" ditto -rsrcFork npvlc.rsrc "./$@/Contents/MacOS/$@.rsrc"
cp $(top_srcdir)/extras/MacOSX/plugin/Info.plist "./$@/Contents/Info.plist" cp $(top_srcdir)/extras/MacOSX/plugin/Info.plist "./$@/Contents/Info.plist"
cp $(top_srcdir)/extras/MacOSX/plugin/pbdevelopment.plist "./$@/Contents/pbdevelopment.plist" cp $(top_srcdir)/extras/MacOSX/plugin/pbdevelopment.plist "./$@/Contents/pbdevelopment.plist"
cp -r $(top_srcdir)/extras/MacOSX/plugin/English.lproj "./$@/Contents/Resources/" cp -r $(top_srcdir)/extras/MacOSX/plugin/English.lproj "./$@/Contents/Resources/"
...@@ -88,6 +87,7 @@ LDFLAGS_npvlc = -arch ppc -bundle -read_only_relocs suppress $(LIBRARIES_libvlc) ...@@ -88,6 +87,7 @@ LDFLAGS_npvlc = -arch ppc -bundle -read_only_relocs suppress $(LIBRARIES_libvlc)
else else
LIBRARIES_libvlc = $(top_builddir)/lib/libvlc_pic.a LIBRARIES_libvlc = $(top_builddir)/lib/libvlc_pic.a
npvlc_DATA = libvlcplugin$(LIBEXT) npvlc_DATA = libvlcplugin$(LIBEXT)
npvlcdir = $(libdir)/mozilla/plugins npvlcdir = $(libdir)/mozilla/plugins
......
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