Place libexec executables directly under the Contents/MacOS/libexec if

the application is self-contained.

diff --git a/mac/ChangeLog b/mac/ChangeLog
index cee81a13dd24efb3f0ce8cfcb0a007bbf7c40ead..6798c4f9e299e503a0d52fe70ae7f32e1c4bb570 100644 (file)
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-04  Steven Tamm  <steventamm@mac.com>
+
+       * make-package: Place libexec executables directly under the
+       Contents/MacOS/libexec if the application is self-contained
+
 2003-04-01  Kim F. Storm  <storm@cua.dk>
 
        * makefile.MPW (frame.c.x): Add dependency on BLOCKINPUT_H_GROUP.

diff --git a/mac/make-package b/mac/make-package
index 5529d8811e4fa28a0f94545706583a86c9cdd740..472df36c36be646ed25815e69f18ee195947b113 100755 (executable)
--- a/mac/make-package
+++ b/mac/make-package
@@ -313,13 +313,15 @@ if test "$with_app" == "yes"; then
   fi
 fi
 
+compver=powerpc-apple-darwin`uname -r`
+ 
 if test "$self_contained" = "yes"; then
     # Move shared files down to Resources directory
     mv $installprefix/share/emacs/$version/* $installprefix
     rm -rf $installprefix/share
     # These directories might remain in Resources
     mv $installprefix/bin $installprefix/../MacOS/bin
-    mv $installprefix/libexec $installprefix/../MacOS/libexec
+    mv $installprefix/libexec/emacs/$version/$compver $installprefix/../MacOS/libexec
     # Make the application binary a hard link
     rm $installprefix/../MacOS/Emacs
     ln $installprefix/../MacOS/bin/emacs $installprefix/../MacOS/Emacs