--- misc/trunk/mac_package_builder/make-tar-file.sh	2019/03/03 09:08:20	3489
+++ misc/trunk/mac_package_builder/make-tar-file.sh	2019/03/03 09:08:44	3490
@@ -85,9 +85,8 @@
 mkdir -p "$D/LinuxSampler/gigedit.app/Contents/MacOS" \
     "$D/lib/gdk-pixbuf-2.0/2.10.0/loaders" \
     "$D/lib/pango/1.8.0/modules" \
-    "$D/lib/gtk-2.0" \
-    "$D/lib/locale/sv/LC_MESSAGES" \
-    "$D/lib/locale/de/LC_MESSAGES" \
+    "$D/share/locale/sv/LC_MESSAGES" \
+    "$D/share/locale/de/LC_MESSAGES" \
     "$D/lib/linuxsampler/plugins"
 
 createuniv lib/gigedit/libgigedit.4.dylib lib/libgigedit.4.dylib
@@ -114,11 +113,11 @@
 
 cp PkgInfo Info.plist "$D/LinuxSampler/gigedit.app/Contents"
 cp pango.modules "$D/lib/pango/pango.modules"
-cp gdk-pixbuf.loaders "$D/lib/gtk-2.0"
-cp $P/x86_64/share/locale/de/LC_MESSAGES/gigedit.mo "$D/lib/locale/de/LC_MESSAGES"
-cp $P/x86_64/share/locale/sv/LC_MESSAGES/gigedit.mo "$D/lib/locale/sv/LC_MESSAGES"
-cp /home/persson/macgtk64/share/locale/de/LC_MESSAGES/gtk20.mo "$D/lib/locale/de/LC_MESSAGES"
-cp /home/persson/macgtk64/share/locale/sv/LC_MESSAGES/gtk20.mo "$D/lib/locale/sv/LC_MESSAGES"
+cp loaders.cache "$D/lib/gdk-pixbuf-2.0/2.10.0"
+cp $P/x86_64/share/locale/de/LC_MESSAGES/gigedit.mo "$D/share/locale/de/LC_MESSAGES"
+cp $P/x86_64/share/locale/sv/LC_MESSAGES/gigedit.mo "$D/share/locale/sv/LC_MESSAGES"
+cp /home/persson/macgtk64/share/locale/de/LC_MESSAGES/gtk20.mo "$D/share/locale/de/LC_MESSAGES"
+cp /home/persson/macgtk64/share/locale/sv/LC_MESSAGES/gtk20.mo "$D/share/locale/sv/LC_MESSAGES"
 
 
 # generate OS X .pkg package / installer ...
@@ -164,20 +163,30 @@
 mkdir -p $dlib
 (
     cd $D/lib/
-    for f in `ls -d linuxsampler libgigedit* locale/*/LC_MESSAGES/gigedit.mo`; do
+    for f in `ls -d linuxsampler libgigedit*`; do
         cp -r --parents $f $dlib
     done
 )
+dlib="$PWD/components/$component.pkg"
+(
+    cd $D
+    cp --parents share/locale/*/LC_MESSAGES/gigedit.mo $dlib
+)
 
 component="libgtk"
 dlib="$PWD/components/$component.pkg/lib"
 mkdir -p $dlib
 (
     cd $D/lib/
-    for f in `ls -d gdk* gtk* locale/*/LC_MESSAGES/gtk20.mo pango libatk* libcairo* libffi* libfont* libfreetype* libgailutil* libgdk* libgio* libglib* libgmodule* libgobject* libgthread* libgtk* libintl* libjpeg* libpango* libpixman* libpng* libsigc* libtiff*`; do
+    for f in `ls -d gdk* gtk* pango libatk* libcairo* libffi* libfont* libfreetype* libgailutil* libgdk* libgio* libglib* libgmodule* libgobject* libgthread* libgtk* libintl* libjpeg* libpango* libpixman* libpng* libsigc* libtiff*`; do
         cp -r --parents $f $dlib
     done
 )
+dlib="$PWD/components/$component.pkg"
+(
+    cd $D
+    cp --parents share/locale/*/LC_MESSAGES/gtk20.mo $dlib
+)
 
 component="liblinuxsampler"
 dlib="components/$component.pkg/lib"
@@ -223,7 +232,7 @@
         ) > ../linuxsampler.prepkg/$d/Payload
         mkbom -u 0 -g 80 $d ../linuxsampler.prepkg/$d/Bom
         size_kb=`du -sk $d | cut -f 1`
-        entries_count=`find . | wc -l`
+        entries_count=`find $d | wc -l`
         cp ../linuxsampler.unpkg/$d/PackageInfo ../linuxsampler.prepkg/$d
         xmltxt=`xmlstarlet ed -u '/pkg-info/payload/@numberOfFiles' -v $entries_count ../linuxsampler.prepkg/$d/PackageInfo | xmlstarlet ed -u '/pkg-info/payload/@installKBytes' -v $size_kb`
         echo $xmltxt > ../linuxsampler.prepkg/$d/PackageInfo