Change name from PYTHON_VERSION_SHORT to PYTHON_VERSION_MAJOR

This commit is contained in:
Ulf Samuelsson 2009-01-11 20:15:35 +00:00
parent 75a291159d
commit 9e15c00a04
2 changed files with 14 additions and 14 deletions

View File

@ -16,7 +16,7 @@ LIBDNET_DEPENDENCIES = uclibc
ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),) ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),)
LIBDNET_DEPENDENCIES += python LIBDNET_DEPENDENCIES += python
LIBDNET_CONF_OPT += --with-python LIBDNET_CONF_OPT += --with-python
LIBDNET_MAKE_OPT = PYTHON=python$(PYTHON_VERSION_SHORT) PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_SHORT) LIBDNET_MAKE_OPT = PYTHON=python$(PYTHON_VERSION_MAJOR) PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
LIBDNET_INSTALL_TARGET_OPT = $(LIBDNET_MAKE_OPT) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec LIBDNET_INSTALL_TARGET_OPT = $(LIBDNET_MAKE_OPT) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
LIBDNET_INSTALL_STAGING_OPT = $(LIBDNET_MAKE_OPT) DESTDIR=$(STAGING_DIR) install LIBDNET_INSTALL_STAGING_OPT = $(LIBDNET_MAKE_OPT) DESTDIR=$(STAGING_DIR) install
endif endif

View File

@ -4,7 +4,7 @@
# #
############################################################# #############################################################
PYTHON_VERSION=2.4.5 PYTHON_VERSION=2.4.5
PYTHON_VERSION_SHORT=2.4 PYTHON_VERSION_MAJOR=2.4
PYTHON_SOURCE:=Python-$(PYTHON_VERSION).tar.bz2 PYTHON_SOURCE:=Python-$(PYTHON_VERSION).tar.bz2
PYTHON_SITE:=http://python.org/ftp/python/$(PYTHON_VERSION) PYTHON_SITE:=http://python.org/ftp/python/$(PYTHON_VERSION)
PYTHON_DIR:=$(BUILD_DIR)/Python-$(PYTHON_VERSION) PYTHON_DIR:=$(BUILD_DIR)/Python-$(PYTHON_VERSION)
@ -12,7 +12,7 @@ PYTHON_CAT:=$(BZCAT)
PYTHON_BINARY:=python PYTHON_BINARY:=python
PYTHON_TARGET_BINARY:=usr/bin/python PYTHON_TARGET_BINARY:=usr/bin/python
PYTHON_DEPS:= PYTHON_DEPS:=
PYTHON_SITE_PACKAGE_DIR=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_SHORT)/site-packages PYTHON_SITE_PACKAGE_DIR=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
BR2_PYTHON_DISABLED_MODULES=dbm zipfile BR2_PYTHON_DISABLED_MODULES=dbm zipfile
@ -78,7 +78,7 @@ $(PYTHON_DIR)/.unpacked: $(DL_DIR)/$(PYTHON_SOURCE)
touch $@ touch $@
$(PYTHON_DIR)/.patched: $(PYTHON_DIR)/.unpacked $(PYTHON_DIR)/.patched: $(PYTHON_DIR)/.unpacked
toolchain/patch-kernel.sh $(PYTHON_DIR) package/python/ python-$(PYTHON_VERSION_SHORT)-\*.patch toolchain/patch-kernel.sh $(PYTHON_DIR) package/python/ python-$(PYTHON_VERSION_MAJOR)-\*.patch
touch $@ touch $@
$(PYTHON_DIR)/.hostpython: $(PYTHON_DIR)/.patched $(PYTHON_DIR)/.hostpython: $(PYTHON_DIR)/.patched
@ -134,16 +134,16 @@ endif
PYTHON_DISABLE_MODULES="$(BR2_PYTHON_DISABLED_MODULES)" \ PYTHON_DISABLE_MODULES="$(BR2_PYTHON_DISABLED_MODULES)" \
HOSTPYTHON=./hostpython HOSTPGEN=./Parser/hostpgen && \ HOSTPYTHON=./hostpython HOSTPGEN=./Parser/hostpgen && \
rm $(TARGET_DIR)/usr/bin/python && \ rm $(TARGET_DIR)/usr/bin/python && \
ln -s python$(PYTHON_VERSION_SHORT) $(TARGET_DIR)/usr/bin/python && \ ln -s python$(PYTHON_VERSION_MAJOR) $(TARGET_DIR)/usr/bin/python && \
rm $(TARGET_DIR)/usr/bin/idle && \ rm $(TARGET_DIR)/usr/bin/idle && \
rm $(TARGET_DIR)/usr/bin/pydoc && \ rm $(TARGET_DIR)/usr/bin/pydoc && \
find $(TARGET_DIR)/usr/lib/ -name '*.pyo' -exec rm {} \; && \ find $(TARGET_DIR)/usr/lib/ -name '*.pyo' -exec rm {} \; && \
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc \
$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_SHORT)/test $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/test
cp -dpr $(TARGET_DIR)/usr/include/python$(PYTHON_VERSION_SHORT) $(STAGING_DIR)/usr/include/ cp -dpr $(TARGET_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) $(STAGING_DIR)/usr/include/
mkdir -p $(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_SHORT) mkdir -p $(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)
cp -dpr $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_SHORT)/config $(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_SHORT)/ cp -dpr $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/config $(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/
ifeq ($(BR2_PACKAGE_PYTHON_PY_ONLY),y) ifeq ($(BR2_PACKAGE_PYTHON_PY_ONLY),y)
find $(TARGET_DIR)/usr/lib/ -name '*.pyc' -exec rm {} \; find $(TARGET_DIR)/usr/lib/ -name '*.pyc' -exec rm {} \;
@ -152,18 +152,18 @@ ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y)
find $(TARGET_DIR)/usr/lib/ -name '*.py' -exec rm {} \; find $(TARGET_DIR)/usr/lib/ -name '*.py' -exec rm {} \;
endif endif
ifneq ($(BR2_PACKAGE_PYTHON_DEV),y) ifneq ($(BR2_PACKAGE_PYTHON_DEV),y)
rm -rf $(TARGET_DIR)/usr/include/python$(PYTHON_VERSION_SHORT) rm -rf $(TARGET_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_SHORT)/config rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/config
find $(TARGET_DIR)/usr/lib/ -name '*.py' -exec rm {} \; find $(TARGET_DIR)/usr/lib/ -name '*.py' -exec rm {} \;
endif endif
ifneq ($(BR2_PACKAGE_PYTHON_BSDDB),y) ifneq ($(BR2_PACKAGE_PYTHON_BSDDB),y)
rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_SHORT)/bsddb rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/bsddb
endif endif
ifneq ($(BR2_PACKAGE_PYTHON_CURSES),y) ifneq ($(BR2_PACKAGE_PYTHON_CURSES),y)
rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_SHORT)/curses rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/curses
endif endif
ifneq ($(BR2_PACKAGE_PYTHON_TKINTER),y) ifneq ($(BR2_PACKAGE_PYTHON_TKINTER),y)
rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_SHORT)/lib-tk rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/lib-tk
endif endif
python: uclibc $(PYTHON_DEPS) $(TARGET_DIR)/$(PYTHON_TARGET_BINARY) python: uclibc $(PYTHON_DEPS) $(TARGET_DIR)/$(PYTHON_TARGET_BINARY)