diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-23 15:52:11 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-23 15:52:11 +0200 |
| commit | f082cffba0eac8316ec58164ee215e75c8a364ed (patch) | |
| tree | 8c935274d3b58a5923bb1d1636d0c2933ad02a1c | |
| parent | 4bbac96d33fbec7707fd580a47a27ceec361987f (diff) | |
| parent | f771c23af1b3ca79359e6422308a0d402ffdef92 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/xcb-proto/Makefile | 8 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index c9db6f817..142ef30eb 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -25,14 +25,14 @@ include $(TOPDIR)/mk/python.mk CONFIGURE_ENV+= PYTHON=$(PYTHON) -xcb-proto-install: +post-build: ${INSTALL_DIR} ${STAGING_DIR}/usr/share/xcb - $(INSTALL_DIR) ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen ${CP} ${WRKBUILD}/src/*.xml ${STAGING_DIR}/usr/share/xcb - ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \ - ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen xcb-python-install: + $(INSTALL_DIR) ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen + ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \ + ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen ${INSTALL_DIR} ${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \ ${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index b88bf6ccc..775f871c1 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -61,11 +61,13 @@ endif ifeq ($(ARCH),m68k) GCC_CONFOPTS+= --disable-tls -else if ($(ARCH),cris) +else +ifeq ($(ARCH),cris) GCC_CONFOPTS+= --disable-tls else GCC_CONFOPTS+= --enable-tls endif +endif ifeq ($(ARCH),powerpc) ifeq ($(ADK_TARGET_LIBC),musl) |