Donn Cave <donn@oz.net>:

Revise BeOS support.

This closes SourceForge patch #101776.

diff --git a/Makefile.in b/Makefile.in
index b80cc2fce6f7d56b4210448f3ae28ba896fb74a6..e474cd4ba2cf464d0b63e8dbfd2b9200825a0919 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -168,7 +168,7 @@ $(LIBRARY): $(SUBDIRS)
                for i in $(SUBDIRS); do \
                        (cd $$i; $(MAKE) VERSION="$(VERSION)" add2lib); done
 
-# This rule is only here for DG/UX!!!
+# This rule is only here for DG/UX and BeOS!!!
 libpython$(VERSION).so:        $(LIBRARY)
                case `uname -s | tr -d '/ ' | tr '[A-Z]' '[a-z]'` in \
                *dgux*) \
@@ -176,6 +176,9 @@ libpython$(VERSION).so:     $(LIBRARY)
                    (cd dgux;ar x ../$^;ld -G -o ../$@ * ); \
                    /bin/rm -rf ./dgux \
                    ;; \
+               beos) \
+                   $(srcdir)/BeOS/ar-fake so $(LIBRARY) $@ \
+                   ;; \
                esac
 
 # This rule is here for OPENSTEP/Rhapsody/MacOSX
@@ -367,7 +370,7 @@ libainstall:        all
                        else    true; \
                        fi; \
                done
-               @if [ "$(MACHDEP)" != "beos" ] ; then \
+               @if test -d $(LIBRARY); then :; else \
                        $(INSTALL_DATA) $(LIBRARY) $(LIBPL)/$(LIBRARY) ; \
                        $(RANLIB) $(LIBPL)/$(LIBRARY) ; \
                fi
@@ -396,23 +399,19 @@ libainstall:      all
                        echo; echo "See Misc/AIX-NOTES for details.";   \
                else true; \
                fi
-               @if [ "$(MACHDEP)" = "beos" ] ; then \
+               @case "$(MACHDEP)" in beos*) \
                        echo; echo "Installing support files for building shared extension modules on BeOS:"; \
                        $(INSTALL_DATA) BeOS/README $(LIBPL)/README;    \
                        echo; echo "$(LIBPL)/README";                   \
                        $(INSTALL_DATA) BeOS/README.readline-2.2 $(LIBPL)/README.readline-2.2; \
                        echo "$(LIBPL)/README.readline-2.2";            \
-                       $(INSTALL_DATA) BeOS/dl_export.h $(LIBPL)/dl_export.h; \
-                       echo "$(LIBPL)/dl_export.h";                    \
                        $(INSTALL_PROGRAM) BeOS/ar-fake $(LIBPL)/ar-fake; \
                        echo "$(LIBPL)/ar-fake";                        \
-                       $(INSTALL_PROGRAM) BeOS/linkcc $(LIBPL)/linkcc; \
-                       echo "$(LIBPL)/linkcc";                         \
                        $(INSTALL_PROGRAM) BeOS/linkmodule $(LIBPL)/linkmodule; \
                        echo "$(LIBPL)/linkmodule";                     \
                        echo; echo "See BeOS/README for details.";      \
-               else true; \
-               fi
+                       ;; \
+               esac
 
 # Install the dynamically loadable modules
 # This goes into $(exec_prefix)