[vlc-commits] npapi/Makefile.am: make sure that the Mac product ends-up in the top build folder instead of 'somewhere'

[Felix Paul Kühne]

npapi-vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Nov 22 15:30:21 2013 +0100| [902a219ee63baa92ba471128d3792c87141f10be] | committer: Felix Paul Kühne

npapi/Makefile.am: make sure that the Mac product ends-up in the top build folder instead of 'somewhere'

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=902a219ee63baa92ba471128d3792c87141f10be
---

 npapi/Makefile.am |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/npapi/Makefile.am b/npapi/Makefile.am
index 18a90c6..ba7d47e 100644
--- a/npapi/Makefile.am
+++ b/npapi/Makefile.am
@@ -170,14 +170,17 @@ endef
 
 VLC\ Plugin.plugin: $(lib_LTLIBRARIES)
 	rm -Rf "$@"
-	$(INSTALL) -d "VLC-Plugin.plugin/Contents/MacOS/lib"
-	$(INSTALL) -d "VLC-Plugin.plugin/Contents/Resources"
-	$(INSTALL) $(top_srcdir)/share/pixmaps/macosx/*.png "VLC-Plugin.plugin/Contents/Resources"
+	$(INSTALL) -d "$(top_builddir)/VLC-Plugin.plugin/Contents/MacOS/lib"
+	$(INSTALL) -d "$(top_builddir)/VLC-Plugin.plugin/Contents/Resources"
+	$(INSTALL) $(top_srcdir)/share/pixmaps/macosx/*.png "$(top_builddir)/VLC-Plugin.plugin/Contents/Resources"
 	ACTION="release-makefile" PRODUCT="VLC-Plugin.plugin" libvlc_dir=$(LIBVLC_PREFIX) src_dir=$(srcdir) build_dir=$(top_builddir) sh "$(top_srcdir)/extras/macosx/build-package.sh"
-	$(INSTALL) "$(top_builddir)/extras/macosx/Info.plist" "VLC-Plugin.plugin/Contents/Info.plist"
-	mv "VLC-Plugin.plugin" "VLC Plugin.plugin"
-	find "VLC Plugin.plugin" -type d -exec chmod ugo+rx '{}' \;
-	find "VLC Plugin.plugin" -type f -exec chmod ugo+r '{}' \;
+	$(INSTALL) "$(top_builddir)/extras/macosx/Info.plist" "$(top_builddir)/VLC-Plugin.plugin/Contents/Info.plist"
+	$(INSTALL) "$(top_builddir)/npapi/.libs/npvlc.dylib" "$(top_builddir)/VLC-Plugin.plugin/Contents/MacOS/"
+	mv $(top_builddir)/VLC-Plugin.plugin/Contents/MacOS/npvlc.dylib "$(top_builddir)/VLC-Plugin.plugin/Contents/MacOS/VLC Plugin"
+	chmod +x "$(top_builddir)/VLC-Plugin.plugin/Contents/MacOS/VLC Plugin"
+	mv "$(top_builddir)/VLC-Plugin.plugin" "$(top_builddir)/VLC Plugin.plugin"
+	find "$(top_builddir)/VLC Plugin.plugin" -type d -exec chmod ugo+rx '{}' \;
+	find "$(top_builddir)/VLC Plugin.plugin" -type f -exec chmod ugo+r '{}' \;
 
 # uncomment if dependencies on XPCOM libs is sought
 #	if test -d "$(MOZILLA_SDK_PATH)/lib"; then \