fix the internal structure of MacOS X dmg

Because of commit e70ea92b "scp: remove
unused macros", which removed the top-level Applications symlink, the
dmg contained an extra dir, e.g.,
LibreOfficeDev_4.1.0.0.alpha0_MacOS_x86/LibreOfficeDev.app instead of
just LibreOfficeDev.app . This symlink used by the installer to
determine the dir to use as top-level for the installation
(solenv/bin/modules/installer/simplepackage.pm:274).

Also revert "Eek, it is hard to get the right path to the .app that is
being built", which was only needed because of the other problem.

This reverts commit 1c25b01f.

Change-Id: Ib5792c7710decd021a62cd33fd841ebe26613fbc

scp2/source/ooo/directory_ooo.scp

@@ -69,6 +69,16 @@ Directory gid_Dir_Bundle_Contents_Library_Spotlight_Bundle_Contents
 End
 #endif
 
+#if defined MACOSX
+Unixlink gid_Unixlink_Applications
+    BIN_FILE_BODY;
+    Styles = ();
+    Dir = PD_PROGDIR;
+    Name = "Applications";
+    Target = "/Applications";
+End
+#endif
+
 Directory gid_Dir_Wizards
     Styles = (CREATE);
     ParentID = gid_Brand_Dir_Program;

solenv/bin/modules/installer/simplepackage.pm

@@ -433,7 +433,7 @@ sub create_package
                 # participate in the signing and their validity can be
                 # guaranteed.
 
-                $systemcall = "codesign --sign $ENV{'MACOSX_CODESIGNING_IDENTITY'} --force -v -v -v $localtempdir/$folder/*/$volume_name_classic_app.app";
+                $systemcall = "codesign --sign $ENV{'MACOSX_CODESIGNING_IDENTITY'} --force -v -v -v $localtempdir/$folder/$volume_name_classic_app.app";
                 print "... $systemcall ...\n";
                 my $returnvalue = system($systemcall);
                 $infoline = "Systemcall: $systemcall\n";