--- a/Makefile.am.newautomake	Fri Jun 28 06:14:52 2002 +0000
+++ b/Makefile.am.newautomake	Fri Jun 28 06:21:17 2002 +0000
@@ -6,9 +6,6 @@
 
 if BUILD_MACOSX
 
-BEOS_SRC = @BUILD_BEOS_CPP@
-BEOS_EXTRADIST = @BUILD_BEOS_EXTRA@
-
 ZLIB_FILES = zlib114/adler32.c		\
              zlib114/compress.c		\
              zlib114/crc32.c		\
@@ -56,7 +53,7 @@
 	archivers/unzip.h   \
 	platform/unix.c     \
 	platform/posix.c    \
-    $(ZLIB_SRC) $(BEOS_SRC)
+    $(ZLIB_SRC)
 
 libphysfs_la_INCLUDES = $(ZLIB_INC)
 
@@ -89,6 +86,7 @@
 	platform/skeleton.c    \
 	platform/macclassic.c  \
 	platform/win32.c       \
+	platform/beos.cpp      \
     extras/physfsrwops.h   \
     extras/physfsrwops.c   \
     extras/physfshttpd.c   \

--- a/configure.in	Fri Jun 28 06:14:52 2002 +0000
+++ b/configure.in	Fri Jun 28 06:21:17 2002 +0000
@@ -236,17 +236,7 @@
 AM_CONDITIONAL(BUILD_ZLIB, test x$enable_internal_zlib = xyes)
 AM_CONDITIONAL(BUILD_TEST_PHYSFS, test x$enable_testprog = xyes)
 AM_CONDITIONAL(BUILD_MACOSX, test x$this_is_macosx = xyes)
-
-if test x$this_is_beos = xyes; then
-  BUILD_BEOS_CPP=beos.cpp
-  BUILD_BEOS_EXTRA=
-else
-  BUILD_BEOS_CPP=
-  BUILD_BEOS_EXTRA=beos.cpp
-fi
-
-AC_SUBST([BUILD_BEOS_CPP])
-AC_SUBST([BUILD_BEOS_EXTRA])
+AM_CONDITIONAL(BUILD_BEOS, test x$this_is_beos = xyes)
 
 LDFLAGS="$LDFLAGS -no-undefined"
 

--- a/platform/Makefile.am	Fri Jun 28 06:14:52 2002 +0000
+++ b/platform/Makefile.am	Fri Jun 28 06:21:17 2002 +0000
@@ -2,8 +2,18 @@
 
 INCLUDES = -I$(top_srcdir)
 
-BEOS_SRC = @BUILD_BEOS_CPP@
-BEOS_EXTRADIST = @BUILD_BEOS_EXTRA@
+if BUILD_BEOS
+BEOS_SRC = beos.cpp
+else
+BEOS_SRC =
+endif
+
+if BUILD_BEOS
+BEOS_EXTRADIST =
+else
+BEOS_EXTRADIST = beos.cpp
+endif
+
 
 libplatform_la_SOURCES =	\
 	unix.c                  \