Fix an incorrect buffer name and remove an unneeded defalias.

[bpt/emacs.git] / mac / make-package

diff --git a/mac/make-package b/mac/make-package
index 85c6646..3bbf785 100755 (executable)
--- a/mac/make-package
+++ b/mac/make-package
@@ -18,26 +18,26 @@
 ####     files inside /usr.  This will replace the default version of
 ####     emacs included with Mac OS X.
 
-# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-#
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
+
+# Contributed by Steven Tamm (steventamm@mac.com).
+
 # This file is part of GNU Emacs.
-#
-# GNU Emacs is free software; you can redistribute it and/or modify
+
+# GNU Emacs is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
 # GNU Emacs is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-#
+
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-#
-# Contributed by Steven Tamm (steventamm@mac.com).
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
 
 progname="$0"
 
@@ -325,11 +325,13 @@ if test "$with_app" == "yes"; then
   fi
 fi
 
-compver=powerpc-apple-darwin`uname -r`
+compver=`uname -p`-apple-darwin`uname -r`
  
 if test "$self_contained" = "yes"; then
     # Move shared files down to Resources directory
     mv $installprefix/share/emacs/$version/* $installprefix
+    mv $installprefix/share/info $installprefix
+    mv $installprefix/share/man $installprefix
     rm -rf $installprefix/share
     # These directories might remain in Resources
     mv $installprefix/bin $installprefix/../MacOS/bin