X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=fe7102e311f71549fe34c05917948991cdde9f41;hb=f9e4aada6337d7c419c8a7d36e359626a39a4390;hp=a351c84a6ec094c603e6df0851ffd8a7d781f6ad;hpb=829dfdeda2a4c39ab7c976c6b3dd7613ee363c1e;p=vlc

diff --git a/Makefile.am b/Makefile.am
index a351c84a6e..fe7102e311 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -337,9 +337,9 @@ vlc-bundle: vlc
 	  done ; \
 	fi
 	cat $(top_srcdir)/po/LINGUAS | while read i; do \
-	  mkdir -p "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \
+	  mkdir -p "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES" ; \
 	  cp "$(top_builddir)/po/$$i.gmo" \
-	    "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
+	    "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
 	done
 	find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \;
 endif
@@ -540,9 +540,9 @@ VLC-release.app: vlc
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/`basename $${i}` ; \
 	done
 	$(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale
+	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale
 	cat $(top_srcdir)/po/LINGUAS | while read i; do \
-	  mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
+	  mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
 	  cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
 	  mkdir -p $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
 	  ln -sf ../English.lproj/InfoPlist.strings \
@@ -639,10 +639,10 @@ VLC.app: vlc
 				   "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
 	  fi ; done && \
 	ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
-	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
+	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/locale
 	cat $(top_srcdir)/po/LINGUAS | while read i; do \
-	  mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
-	  ln -sfn `pwd`/$(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+	  mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
+	  ln -sfn `pwd`/$(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
 	  mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
 	  ln -sf ../English.lproj/InfoPlist.strings \
 	      $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
@@ -687,13 +687,15 @@ package-win-common:
 	cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-$(VERSION)/
 
 # Copy the locales
-	mkdir -p $(top_builddir)/vlc-$(VERSION)/locale
+	mkdir -p $(top_builddir)/vlc-$(VERSION)/share/locale
 	cat $(top_srcdir)/po/LINGUAS | while read i; do \
-	  mkdir -p "$(top_builddir)/vlc-$(VERSION)/locale/$${i}/LC_MESSAGES" ; \
+	  mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/locale/$${i}/LC_MESSAGES" ; \
 	  cp "$(srcdir)/po/$${i}.gmo" \
-	    "$(top_builddir)/vlc-$(VERSION)/locale/$${i}/LC_MESSAGES/vlc.mo" \
+	    "$(top_builddir)/vlc-$(VERSION)/share/locale/$${i}/LC_MESSAGES/vlc.mo" \
             || true ; \
 	done
+	mkdir -p $(top_builddir)/vlc-$(VERSION)/share/locale/qt4/
+	cp $(QT4LOCALEDIR)/*.qm $(top_builddir)/vlc-$(VERSION)/share/locale/qt4/ || true
 
 #  Mozilla plugin
 if BUILD_MOZILLA