5 files changed, 9 insertions, 75 deletions

diff --git a/ChangeLog b/ChangeLog
index 7e290555617..b79c6124b52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-10  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * configure.in: Use macppc for Darwin.
+        * configure: Regenerate.
+
 2008-07-05  Glenn Morris  <rgm@gnu.org>
 
         * make-dist (EMACS): Doc fix.
diff --git a/configure b/configure
index a4b821ae5d4..c5c3ee640b9 100755
--- a/configure
+++ b/configure
@@ -2462,7 +2462,7 @@ _ACEOF
   *-apple-darwin* )
     case "${canonical}" in
       i[3456]86-* )  machine=intel386 ;;
-      powerpc-* )    machine=powermac ;;
+      powerpc-* )    machine=macppc ;;
       * )            unported=yes ;;
     esac
     opsys=darwin
diff --git a/configure.in b/configure.in
index e6a1a7d2aa8..847e98980fe 100644
--- a/configure.in
+++ b/configure.in
@@ -365,7 +365,7 @@ dnl see the `changequote' comment above.
   *-apple-darwin* )
     case "${canonical}" in
       i[3456]86-* )  machine=intel386 ;;
-      powerpc-* )    machine=powermac ;;
+      powerpc-* )    machine=macppc ;;
       * )            unported=yes ;;
     esac
     opsys=darwin
diff --git a/src/ChangeLog b/src/ChangeLog
index 98865bfae13..7767dedd291 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2008-07-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        * m/powermac.h: Remove file, it is now identical to m/macppc.h.
+
         * m/powermac.h: Remove boilerplate comments.
         (NO_REMAP): Remove unused definition.
 
diff --git a/src/m/powermac.h b/src/m/powermac.h
deleted file mode 100644
index 4c7cc27d411..00000000000
--- a/src/m/powermac.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Machine description file for Apple Power Macintosh
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-     Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-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 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.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="darwin"  */
-
-/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
-   is the most significant byte.  */
-
-#define WORDS_BIG_ENDIAN
-
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-#define NO_ARG_ARRAY
-
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-
-/* #define WORD_MACHINE */
-
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-
-/* Use type int rather than a union, to represent Lisp_Object */
-/* This is desirable for most machines.  */
-
-#define NO_UNION_TYPE
-
-/* Data type of load average, as read out of kmem.  */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* Some really obscure 4.2-based systems (like Sequent DYNIX)
- * do not support asynchronous I/O (using SIGIO) on sockets,
- * even though it works fine on tty's.  If you have one of
- * these systems, define the following, and then use it in
- * config.h (or elsewhere) to decide when (not) to use SIGIO.
- *
- * You'd think this would go in an operating-system description file,
- * but since it only occurs on some, but not all, BSD systems, the
- * reasonable place to select for it is in the machine description
- * file.
- */
-
-/* #define NO_SOCK_SIGIO */
-
-/* arch-tag: d8af08a6-48b3-4c8a-94a0-0b4acae5e1f0
-   (do not change this comment) */