Skip to content

V
vlc-gpu
Commit ad7ad8bc authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

It's cp -R not cp -r

parent dfc4c53e
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
Makefile.am
View file @ ad7ad8bc
...@@ -566,7 +566,7 @@ VLC-release.app: vlc ...@@ -566,7 +566,7 @@ VLC-release.app: vlc
echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \ echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \
fi fi
rm -Rf $(top_builddir)/VLC-release.app rm -Rf $(top_builddir)/VLC-release.app
cp -r $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras cp -R $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \ for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done done
...@@ -616,15 +616,15 @@ VLC-release.app: vlc ...@@ -616,15 +616,15 @@ VLC-release.app: vlc
case $(target_triplet) in \ case $(target_triplet) in \
*darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
cd ../../../; \ cd ../../../; \
cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC-release.app;; \ $(top_builddir)/VLC-release.app;; \
*darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
cd ../../../; \ cd ../../../; \
cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC-release.app;; \ $(top_builddir)/VLC-release.app;; \
*darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
cd ../../../; \ cd ../../../; \
cp -r $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
$(top_builddir)/VLC-release.app;; \ $(top_builddir)/VLC-release.app;; \
esac esac
rm -Rf $(top_builddir)/tmp rm -Rf $(top_builddir)/tmp
...@@ -680,7 +680,7 @@ VLC.app: vlc ...@@ -680,7 +680,7 @@ VLC.app: vlc
echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \ echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \
fi fi
rm -Rf $(top_builddir)/VLC.app rm -Rf $(top_builddir)/VLC.app
cp -r $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras cp -R $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \ for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done done
...@@ -730,15 +730,15 @@ VLC.app: vlc ...@@ -730,15 +730,15 @@ VLC.app: vlc
case $(target_triplet) in \ case $(target_triplet) in \
*darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
cd ../../../; \ cd ../../../; \
cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC.app;; \ $(top_builddir)/VLC.app;; \
*darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
cd ../../../; \ cd ../../../; \
cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC.app;; \ $(top_builddir)/VLC.app;; \
*darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
cd ../../../; \ cd ../../../; \
cp -r $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
$(top_builddir)/VLC.app;; \ $(top_builddir)/VLC.app;; \
esac esac
rm -Rf $(top_builddir)/tmp rm -Rf $(top_builddir)/tmp
...@@ -1065,7 +1065,7 @@ package-macosx: ...@@ -1065,7 +1065,7 @@ package-macosx:
# Copy relevant files # Copy relevant files
cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/tmp/VLC.app" cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/tmp/VLC.app"
cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/ && cp -r extras/MacOSX/Delete\ Preferences.app $(top_builddir)/tmp/ cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/ && cp -R extras/MacOSX/Delete\ Preferences.app $(top_builddir)/tmp/
# Create disk image # Create disk image
$(srcdir)/extras/MacOSX/macosx-dmg "vlc-${VERSION}" $(top_builddir)/tmp $(srcdir)/extras/MacOSX/macosx-dmg "vlc-${VERSION}" $(top_builddir)/tmp
......
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