Commit 860a7e5c authored by Rafaël Carré's avatar Rafaël Carré

OSX packaging: fix http lua

Use make install instead of broken rule in a custom script
Close #5891
Also move headers installation from said script to package.mak

We should use make install in the main directory but for some reason
the rule recurses and never ends
parent c16d7996
...@@ -25,8 +25,9 @@ VLC.app: VLC-tmp ...@@ -25,8 +25,9 @@ VLC.app: VLC-tmp
VLC-tmp: vlc VLC-tmp: vlc
$(AM_V_GEN)(cd src && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd)) $(AM_V_GEN)for i in src lib share; do \
(cd lib && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd)) (cd $$i && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd)); \
done
rm -Rf "$(top_builddir)/tmp" "$@" rm -Rf "$(top_builddir)/tmp" "$@"
mkdir -p "$(top_builddir)/tmp/extras/package/macosx" mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
cd $(srcdir)/extras/package/macosx; cp -R Resources README.MacOSX.rtf $(abs_top_builddir)/tmp/extras/package/macosx/ cd $(srcdir)/extras/package/macosx; cp -R Resources README.MacOSX.rtf $(abs_top_builddir)/tmp/extras/package/macosx/
...@@ -46,7 +47,9 @@ VLC-tmp: vlc ...@@ -46,7 +47,9 @@ VLC-tmp: vlc
cp -R -L $(top_builddir)/tmp/build/Default/VLC.bundle $@ cp -R -L $(top_builddir)/tmp/build/Default/VLC.bundle $@
mkdir -p $@/Contents/Frameworks && cp -R -L $(CONTRIB_DIR)/Growl.framework $@/Contents/Frameworks/ mkdir -p $@/Contents/Frameworks && cp -R -L $(CONTRIB_DIR)/Growl.framework $@/Contents/Frameworks/
mkdir -p $@/Contents/MacOS/share/locale/ mkdir -p $@/Contents/MacOS/share/locale/
cp -r $(srcdir)/share/lua $@/Contents/MacOS/share/ cp -r "$(prefix)/lib/vlc/lua" "$(prefix)/share/vlc/lua" $@/Contents/MacOS/share/
mkdir -p $@Contents/MacOS/include/
cp -r "$(srcdir)/include/vlc" $@/Contents/MacOS/include/
$(INSTALL) -m 644 $(srcdir)/share/vlc512x512.png $@/Contents/MacOS/share/vlc512x512.png $(INSTALL) -m 644 $(srcdir)/share/vlc512x512.png $@/Contents/MacOS/share/vlc512x512.png
cat $(top_srcdir)/po/LINGUAS | while read i; do \ cat $(top_srcdir)/po/LINGUAS | while read i; do \
$(INSTALL) -d $@/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \ $(INSTALL) -d $@/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
......
...@@ -52,7 +52,6 @@ target_bin="${target}/bin" ...@@ -52,7 +52,6 @@ target_bin="${target}/bin"
target_lib="${target}/${lib}" # Should we consider using a different well-known folder like shared resources? target_lib="${target}/${lib}" # Should we consider using a different well-known folder like shared resources?
target_plugins="${target}/${plugins}" # Should we consider using a different well-known folder like shared resources? target_plugins="${target}/${plugins}" # Should we consider using a different well-known folder like shared resources?
target_share="${target}/${share}" # Should we consider using a different well-known folder like shared resources? target_share="${target}/${share}" # Should we consider using a different well-known folder like shared resources?
target_include="${target}/${include}" # Should we consider using a different well-known folder like shared resources?
linked_libs="" linked_libs=""
prefix=".libs/" prefix=".libs/"
suffix="dylib" suffix="dylib"
...@@ -250,21 +249,13 @@ popd > /dev/null ...@@ -250,21 +249,13 @@ popd > /dev/null
########################## ##########################
# Build the share folder # Build the share folder
echo "Building share folder..." if [ $PRODUCT != "VLC.app" ]; then
pbxcp="/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp -exclude .DS_Store -resolve-src-symlinks" echo "Building share folder..."
mkdir -p ${target_share} pbxcp="/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp -exclude .DS_Store -resolve-src-symlinks -v -V"
if test "$use_archs" = "no"; then mkdir -p ${target_share}
$pbxcp ${VLC_BUILD_DIR}/share/lua ${target_share} if test "$use_archs" = "no"; then
else $pbxcp ${VLC_BUILD_DIR}/share/lua ${target_share}
$pbxcp ${main_build_dir}/share/lua ${target_share} else
fi $pbxcp ${main_build_dir}/share/lua ${target_share}
fi
##########################
# Exporting headers
if [ "$FULL_PRODUCT_NAME" = "VLC.app" ] ; then
echo "Exporting headers..."
mkdir -p ${target_include}/vlc
$pbxcp ${VLC_SRC_DIR}/include/vlc/*.h ${target_include}/vlc
else
echo "Headers not needed for this product"
fi fi
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