Changeset 10 for python/trunk/Makefile.pre.in

Timestamp:

Sep 3, 2010, 5:33:06 PM (15 years ago)

Author:

Yuri Dario

Message:

python: merged offline changes.

File:

• python/trunk/Makefile.pre.in (modified) (7 diffs)

python/trunk/Makefile.pre.in

@@ -158 +158 @@
 LDLIBRARYDIR=   @LDLIBRARYDIR@
 INSTSONAME=     @INSTSONAME@
+CONDENSED_VERSION=      @CONDENSED_VERSION@
 
 
@@ -454 +455 @@
         $(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources
 
+ifneq ($(filter os2emx os2knix,$(MACHDEP)),) # bird hack!
+$(DLLLIBRARY) $(LDLIBRARY): $(LIBRARY_OBJS)
+        $(LDSHARED) -o $(DLLLIBRARY) $^ $(LIBS) $(MODLIBS) $(SYSLIBS)
+        emximp -o $(LDLIBRARY) $(DLLLIBRARY)
+
+else # CYGWIN
 # This rule builds the Cygwin Python DLL and import library if configured
 # for a shared core library; otherwise, this rule is a noop.
@@ -462 +469 @@
         else true; \
         fi
+endif # end bird hack!  
 
 
@@ -533 +541 @@
 
 $(AST_H): $(AST_ASDL) $(ASDLGEN_FILES)
+ifndef BOOTSTRAPPING_PYTHON
         $(ASDLGEN) -h $(AST_H_DIR) $(AST_ASDL)
+endif
 
 $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES)
+ifndef BOOTSTRAPPING_PYTHON
         $(ASDLGEN) -c $(AST_C_DIR) $(AST_ASDL)
+endif
 
 Python/compile.o Python/symtable.o: $(GRAMMAR_H) $(AST_H)
@@ -764 +776 @@
         -rm -f $(DESTDIR)$(BINDIR)/python-config
         (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config)
+        rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
+        $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/$(PYTHON); \
+        $(INSTALL_DATA) $(LDLIBRARY) $(DLLLIBRARY) $(DESTDIR)$(LIBDIR); \
 
 # Install the interpreter with $(VERSION) affixed
@@ -906 +921 @@
                 ./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
 
+ifneq ($(filter os2emx os2knix,$(MACHDEP)),) # bird hack!
+PATH_SEPARATOR = ;
+else
+PATH_SEPARATOR = :
+endif
+                                 
 # Create the PLATDIR source directory, if one wasn't distributed..
 $(srcdir)/Lib/$(PLATDIR):
         mkdir $(srcdir)/Lib/$(PLATDIR)
         cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
-        export PATH; PATH="`pwd`:$$PATH"; \
+        export PATH; PATH="`pwd`$(PATH_SEPARATOR)$$PATH"; \
         export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
         export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
@@ -1006 +1027 @@
                 --install-scripts=$(BINDIR) \
                 --install-platlib=$(DESTSHARED) \
-                --root=/$(DESTDIR)
+                --root=$(DESTDIR)
 
 # Here are a couple of targets for MacOSX again, to install a full