From 69f65801aba085385625ea7a4a14c6253f680fff Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Tue, 3 Mar 1998 21:47:00 +0000
Subject: [PATCH] Misc changes for AIX: install the python.exp file, and
 properly use $(srcdir).

---
 Makefile.in  | 15 +++++++++++++++
 configure    |  4 ++--
 configure.in |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 9a4d29c2a72..8b2c97995bc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -388,6 +388,21 @@ libainstall:	all
 		$(INSTALL_PROGRAM) $(srcdir)/Modules/makesetup $(LIBPL)/makesetup
 		$(INSTALL_PROGRAM) $(srcdir)/install-sh $(LIBPL)/install-sh
 		$(INSTALL_DATA) $(srcdir)/Misc/Makefile.pre.in $(LIBPL)/Makefile.pre.in
+		@if [ -s Modules/python.exp -a \
+			"`echo $(MACHDEP) | cut -c 1-3`" = "aix" ]; then \
+			echo; echo "Installing support files for building shared extension modules on AIX:"; \
+			$(INSTALL_DATA) Modules/python.exp		\
+					$(LIBPL)/python.exp;		\
+			echo; echo "$(LIBPL)/python.exp";		\
+			$(INSTALL_PROGRAM) $(srcdir)/Modules/makexp_aix	\
+					$(LIBPL)/makexp_aix;		\
+			echo "$(LIBPL)/makexp_aix";			\
+			$(INSTALL_PROGRAM) $(srcdir)/Modules/ld_so_aix	\
+					$(LIBPL)/ld_so_aix;		\
+			echo "$(LIBPL)/ld_so_aix";			\
+			echo; echo "See Misc/AIX-NOTES for details.";	\
+		else true; \
+		fi
 
 # Install the dynamically loadable modules
 # This goes into $(exec_prefix)
diff --git a/configure b/configure
index 7037a6ffc39..93fd5b9afa0 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.77 
+# From configure.in Revision: 1.78 
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.12 
@@ -1874,7 +1874,7 @@ echo "configure:1874: checking LINKFORSHARED" >&5
 if test -z "$LINKFORSHARED"
 then
 	case $ac_sys_system/$ac_sys_release in
-	AIX*)	LINKFORSHARED='-Wl,-bE:$(srcdir)/python.exp -lld';;
+	AIX*)	LINKFORSHARED='-Wl,-bE:python.exp -lld';;
 	hp*|HP*)
 	    LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
 	Linux*) LINKFORSHARED="-Xlinker -export-dynamic";;
diff --git a/configure.in b/configure.in
index 2deb753825f..358c9248b72 100644
--- a/configure.in
+++ b/configure.in
@@ -322,7 +322,7 @@ AC_MSG_CHECKING(LINKFORSHARED)
 if test -z "$LINKFORSHARED"
 then
 	case $ac_sys_system/$ac_sys_release in
-	AIX*)	LINKFORSHARED='-Wl,-bE:$(srcdir)/python.exp -lld';;
+	AIX*)	LINKFORSHARED='-Wl,-bE:python.exp -lld';;
 	hp*|HP*)
 	    LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
 	Linux*) LINKFORSHARED="-Xlinker -export-dynamic";;