- Use PY_CFLAGS when compile modules that will be part of the interpreter.

- Put shared modules in the same place as object files.

diff --git a/Modules/makesetup b/Modules/makesetup
index 7f231a94a9cc3197cabb67d809f9e1487fa11a24..dcb19b0b16b672ae5292fcf7c6c2e48179fc2d92 100755 (executable)
--- a/Modules/makesetup
+++ b/Modules/makesetup
@@ -216,9 +216,11 @@ sed -e 's/[        ]*#.*//' -e '/^[        ]*$/d' |
                        *) src='$(srcdir)/'"$srcdir/$src";;
                        esac
                        case $doconfig in
-                       no)     cc="$cc \$(CCSHARED)";;
+                       no)     cc="$cc \$(CCSHARED) \$(CFLAGS)";;
+                       *)
+                               cc="$cc \$(PY_CFLAGS)";;
                        esac
-                       rule="$obj: $src; $cc $cpps \$(CFLAGS) -c $src -o $obj"
+                       rule="$obj: $src; $cc $cpps -c $src -o $obj"
                        echo "$rule" >>$rulesf
                done
                case $doconfig in
@@ -230,7 +232,7 @@ sed -e 's/[         ]*#.*//' -e '/^[        ]*$/d' |
                        *$mod.o*)       base=$mod;;
                        *)              base=${mod}module;;
                        esac
-                       file="$base\$(SO)"
+                       file="$srcdir/$base\$(SO)"
                        case $doconfig in
                        no)     SHAREDMODS="$SHAREDMODS $file";;
                        esac