summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorThomas Collerton <tom.coll91@gmail.com>2012-05-09 01:22:29 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-05-09 16:31:31 +0200
commit9520dbf59f6bd6c86791954e082488556a610adc (patch)
treeb898c1539aa58e5f57f33ce606da4d27480e4f69 /python
parentd7f5dcbc413b4bf89a70fc25a20533323840b63c (diff)
EasyHack fdo#42783: get rid of CPU define/build system variable
Change-Id: I6a178f7ff9c8306e15bcfa847ad1e5e4f8476504
Diffstat (limited to 'python')
-rw-r--r--python/makefile.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/python/makefile.mk b/python/makefile.mk
index 5043b28f3ef3..874fd4ff2a96 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -98,7 +98,7 @@ my_prefix = python-inst
CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure --prefix=/$(my_prefix) --enable-shared CFLAGS="$(python_CFLAGS)" LDFLAGS="$(python_LDFLAGS)"
-.IF "$(OS)$(CPU)" == "SOLARISI"
+.IF "$(OS)$(CPUNAME)" == "SOLARISINTEL"
CONFIGURE_ACTION += --disable-ipv6
.ENDIF
@@ -147,7 +147,7 @@ BUILD_DIR=PC/VS7.1
BUILD_DIR=PC/VC6
.ENDIF
-.IF "$(CPU)" == "I"
+.IF "$(CPUNAME)" == "INTEL"
ARCH=Win32
.ELSE
ARCH=x64