diff options
| -rw-r--r-- | package/python/Makefile | 11 | ||||
| -rw-r--r-- | package/python/patches/patch-Makefile_pre_in | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/package/python/Makefile b/package/python/Makefile index e0df5d9e4..a602c6706 100644 --- a/package/python/Makefile +++ b/package/python/Makefile @@ -20,8 +20,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,PYTHON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) MAKE_ENV+= OPT="$(TARGET_CFLAGS)" \ - HOSTPYTHON=./hostpython \ - HOSTPGEN=./hostpgen \ + HOSTPYTHON=hostpython \ + HOSTPGEN=hostpgen \ CROSS_COMPILE=yes CONFIGURE_STYLE:= gnu @@ -39,9 +39,10 @@ pre-configure: --prefix=$(STAGING_TOOLS) \ ); $(MAKE) -C ${WRKBUILD} python Parser/pgen - (cd $(WRKBUILD);mv Parser/pgen hostpgen) - ${CP} ${WRKBUILD}/python ${WRKBUILD}/hostpython - $(MAKE) -C ${WRKBUILD} HOSTPYTHON="./hostpython" sharedmods install + ${CP} ${WRKBUILD}/Parser/pgen ${STAGING_TOOLS}/bin/hostpgen + ${CP} ${WRKBUILD}/python ${STAGING_TOOLS}/bin/hostpython + PATH='${TARGET_PATH}' \ + $(MAKE) -C ${WRKBUILD} HOSTPYTHON="hostpython" sharedmods install $(MAKE) -C ${WRKBUILD} distclean post-install: diff --git a/package/python/patches/patch-Makefile_pre_in b/package/python/patches/patch-Makefile_pre_in index bbf50fb57..ac6c129ee 100644 --- a/package/python/patches/patch-Makefile_pre_in +++ b/package/python/patches/patch-Makefile_pre_in @@ -1,5 +1,5 @@ --- Python-3.1.1.orig/Makefile.pre.in 2009-06-12 00:54:11.000000000 +0200 -+++ Python-3.1.1/Makefile.pre.in 2009-09-16 21:36:12.000000000 +0200 ++++ Python-3.1.1/Makefile.pre.in 2009-09-23 21:48:18.000000000 +0200 @@ -177,6 +177,7 @@ LIBOBJS= @LIBOBJS@ PYTHON= python$(EXE) @@ -38,8 +38,8 @@ @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)' ./$(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ -+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ ++ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ ++ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ esac # Build static library |