if test "$display_usage" = "yes"; then
cat <<EOF
-\`make-package' generates a Mac OS X installer package from an Emacs
-distribution. By default, this first runs ./configure on the emacs
-directory. Then make install to create the emacs distribution.
-Then some mac-specific commands to generate the required information
+\`make-package' generates a Mac OS X installer package from an Emacs
+distribution. By default, this first runs ./configure on the emacs
+directory. Then make install to create the emacs distribution.
+Then some mac-specific commands to generate the required information
for the mac package. The installer will, by default, create a
Carbon application called Emacs in the ${appsdir} directory, with the
shared emacs files in /usr/local
--no-conf Do not run the configure script before running
make install.
--without-app Do not create the Emacs application bundle
- --with-x Setup the install to use X Windows for its
+ --with-x Setup the install to use X Windows for its
windowed display, instead of carbon. Implies
--without-app.
--without-full-dist Do not include all the .el files in the distribution.
to the install in [prefix]/bin/emacs and have
the emacs executable link to emacs-${version}
--self-contained Create an Emacs.app that is self-contained;
- prefix will be ignored and all files installed
- inside the application
+ prefix will be ignored and all files installed
+ inside the application
--build-in-place Build the application in the source directory
- instead of a temporary directory.
+ instead of a temporary directory.
--build-dir=DIR Build the application in the specified directory
instead of a temporary directory. Mutually exclusive
with --build-in-place.
tempbuild="make-package.build.$$"
builddir="`pwd`/${tempbuild}"
removable_build_dir=${builddir}
+ mkdir -p ${builddir}
;;
[\\/]* | ?:[\\/]* ) #Absolutepath.
mkdir -p ${builddir}
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
echo "Creating Package Info file"
-mkdir ${packagedir}
+mkdir -p ${packagedir}
mkdir ${packagedir}/Contents
mkdir ${packagedir}/Contents/Resources
mkdir ${packagedir}/Contents/Resources/English.lproj
echo 'OverwritePermissions NO' >> ${infofile}
echo 'InstallFat NO' >> ${infofile}
-### Set the install directory to install files as root...
+### Set the install directory to install files as root...
### Not sure if this is a good diea
# echo "Setting owner to root"
# chown -Rh 0 ${tempparentfull}
cat ${sizesfile}
echo "Creating Disc Image"
-## Allocate an extra 5000 sectors (about 2.5 mg)
-## Note a sector appears to be 512k
-sectorsAlloced=`echo 2*${compressedSize}+20|bc`
+## From hdiutil man page, a sector is 512k. Allocate an extra 5% for
+## directories and partition tables.
+sectorsAlloced=`echo 2.1*${compressedSize}|bc`
hdiutil create -ov ${builddir}/mac/EmacsRW -sectors ${sectorsAlloced}
## Need to format the disc image before mounting
mountLoc=`hdid -nomount ${builddir}/mac/EmacsRW.dmg | grep HFS | cut -f1`
if [ ! -d /Volumes/Emacs ]; then
echo "Could not create disc image. The Emacs installer package (Emacs.pkg)
-in this directory should be correct. Please use the Disc Copy program to
+in this directory should be correct. Please use the Disc Copy program to
create a disc image." >&2
exit 0
fi
echo "Cleaning up the staging directory"
rm -rf ${builddir}/mac/Emacs.pkg ${removable_build_dir}
+# arch-tag: 1b631d0d-9fde-4f71-80c0-33e0e5815515
### make-package ends here