diff options
| author | Neil Schemenauer <nascheme@enme.ucalgary.ca> | 2001-02-16 03:36:53 (GMT) |
|---|---|---|
| committer | Neil Schemenauer <nascheme@enme.ucalgary.ca> | 2001-02-16 03:36:53 (GMT) |
| commit | 75e33892f86d00647c4c970ffc773f291c2e5eb1 (patch) | |
| tree | 6b80149382e0f37b8d5ef8ec1fd5ed56230d590c | |
| parent | 1a020868857cc58be9c2f36400b6e1c178750a49 (diff) | |
| download | cpython-75e33892f86d00647c4c970ffc773f291c2e5eb1.zip cpython-75e33892f86d00647c4c970ffc773f291c2e5eb1.tar.gz cpython-75e33892f86d00647c4c970ffc773f291c2e5eb1.tar.bz2 | |
Simplify linking on BeOS. Rename some files. Closes SF patch #103679.
| -rw-r--r-- | Makefile.pre.in | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index efe8862..9eca6bc 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -106,6 +106,7 @@ LIBP= $(LIBDIR)/python$(VERSION) # Symbols used for using shared libraries SO= @SO@ LDSHARED= @LDSHARED@ +BLDSHARED= @BLDSHARED@ DESTSHARED= $(BINLIBDEST)/lib-dynload # Executable suffix (.exe on Windows and Mac OS X) @@ -329,7 +330,7 @@ libpython$(VERSION).so: $(LIBRARY) /bin/rm -rf ./dgux \ ;; \ beos) \ - $(srcdir)/BeOS/ar-fake so $(LIBRARY) $@ \ + $(AR) so $(LIBRARY) $@ \ ;; \ esac @@ -690,15 +691,13 @@ libainstall: all fi @case "$(MACHDEP)" in beos*) \ echo; echo "Installing support files for building shared extension modules on BeOS:"; \ - $(INSTALL_DATA) BeOS/README $(LIBPL)/README; \ + $(INSTALL_DATA) Misc/BeOS-NOTES $(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_PROGRAM) BeOS/ar-fake $(LIBPL)/ar-fake; \ - echo "$(LIBPL)/ar-fake"; \ - $(INSTALL_PROGRAM) BeOS/linkmodule $(LIBPL)/linkmodule; \ - echo "$(LIBPL)/linkmodule"; \ - echo; echo "See BeOS/README for details."; \ + $(INSTALL_PROGRAM) Modules/ar_beos $(LIBPL)/ar_beos; \ + echo "$(LIBPL)/ar_beos"; \ + $(INSTALL_PROGRAM) Modules/ld_so_beos $(LIBPL)/ld_so_beos; \ + echo "$(LIBPL)/ld_so_beos"; \ + echo; echo "See Misc/BeOS-NOTES for details."; \ ;; \ esac |