[Emacs-diffs] Changes to emacs/mac/make-package

[Juanma Barranquero]

Index: emacs/mac/make-package
diff -c emacs/mac/make-package:1.16 emacs/mac/make-package:1.17
*** emacs/mac/make-package:1.16 Tue Jan 14 12:49:00 2003
--- emacs/mac/make-package      Tue Feb  4 09:12:13 2003
***************
*** 116,125 ****
  
  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 
  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
--- 116,125 ----
  
  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
  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
***************
*** 133,139 ****
        --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 
                            windowed display, instead of carbon.  Implies
                            --without-app.
        --without-full-dist Do not include all the .el files in the 
distribution.
--- 133,139 ----
        --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
                            windowed display, instead of carbon.  Implies
                            --without-app.
        --without-full-dist Do not include all the .el files in the 
distribution.
***************
*** 142,151 ****
                            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 
        --build-in-place    Build the application in the source 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.
--- 142,151 ----
                            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
        --build-in-place    Build the application in the source 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.
***************
*** 357,363 ****
  echo 'OverwritePermissions NO' >> ${infofile}
  echo 'InstallFat NO' >> ${infofile}
  
! ### 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}
--- 357,363 ----
  echo 'OverwritePermissions NO' >> ${infofile}
  echo 'InstallFat NO' >> ${infofile}
  
! ### 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}
***************
*** 402,408 ****
  
  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 
  create a disc image." >&2
    exit 0
  fi
--- 402,408 ----
  
  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
  create a disc image." >&2
    exit 0
  fi