casa-mp-base

--- Makefile.pre.in.orig    2008-09-22 10:22:44.000000000 +1000

+++ Makefile.pre.in 2011-10-27 06:47:17.000000000 +1100

@@ -348,8 +348,8 @@

 # Build the shared modules

 sharedmods: $(BUILDPYTHON)

    case $$MAKEFLAGS in \

-   *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \

-   *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \

+   *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q --no-user-cfg build;; \

+   *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py --no-user-cfg build;; \

    esac

 # Build static library

@@ -387,7 +387,7 @@

                 $(RESSRCDIR)/English.lproj/InfoPlist.strings

    $(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)

    if test "${UNIVERSALSDK}"; then \

-       $(CC) -o $(LDLIBRARY) -arch i386 -arch ppc -dynamiclib \

+       $(CC) -o $(LDLIBRARY) __UNIVERSAL_LDFLAGS__ -dynamiclib \

            -isysroot "${UNIVERSALSDK}" \

            -all_load $(LIBRARY) -Wl,-single_module \

            -install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python \

@@ -458,7 +458,7 @@

        $(SIGNAL_OBJS) \

        $(MODOBJS) \

        $(srcdir)/Modules/getbuildinfo.c

-   $(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LC_ALL=C $(SVNVERSION)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c

+   $(CC) -c $(PY_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" -o $@ $(srcdir)/Modules/getbuildinfo.c

 Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile

    $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \

@@ -894,7 +894,7 @@

 # Install the dynamically loadable modules

 # This goes into $(exec_prefix)

 sharedinstall:

-   $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \

+   $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py --no-user-cfg install \

        --prefix=$(prefix) \

        --install-scripts=$(BINDIR) \

        --install-platlib=$(DESTSHARED) \

@@ -968,7 +968,7 @@

 # This installs a few of the useful scripts in Tools/scripts

 scriptsinstall:

    SRCDIR=$(srcdir) $(RUNSHARED) \

-   ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \

+   ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py --no-user-cfg install \

    --prefix=$(prefix) \

    --install-scripts=$(BINDIR) \

    --root=/$(DESTDIR)