diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-11 18:20:46 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-11 18:20:46 +0100 |
| commit | b4c24c8ee4081fff087ca113c7d0087d4462e5aa (patch) | |
| tree | c91cfe82c500dbf8ee126fc2361eb6d24378a685 /package/bzr/Makefile | |
| parent | b608c5a7dc38765319cc5f7cb32d35fcb0701d08 (diff) | |
| parent | 72d93163012bc54c99ba5cd589f583fbf2c0dad6 (diff) | |
update todo, resolv conflict
Diffstat (limited to 'package/bzr/Makefile')
| -rw-r--r-- | package/bzr/Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/package/bzr/Makefile b/package/bzr/Makefile index ba8aba484..845ce4827 100644 --- a/package/bzr/Makefile +++ b/package/bzr/Makefile @@ -1,12 +1,12 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted +# This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. include $(TOPDIR)/rules.mk PKG_NAME:= bzr -PKG_VERSION:= 2.3b3 +PKG_VERSION:= 2.3b4 PKG_RELEASE:= 1 -PKG_MD5SUM:= 94f9181b9a4ab84b94cfbc06bd5dfd91 +PKG_MD5SUM:= 62ba2dbd8b13745bc89e24dd4191cdc5 PKG_DESCR:= bazaar PKG_SECTION:= scm PKG_DEPENDS:= python2 @@ -25,11 +25,13 @@ INSTALL_STYLE:= manual include $(TOPDIR)/mk/python.mk do-build: - cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr" + cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix=$(WRKINST)/usr build_ext --allow-python-fallback do-install: + $(INSTALL_DIR) $(IDIR_BZR)/usr/lib/python$(PYTHON_VERSION)/site-packages + $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/* \ + $(IDIR_BZR)/usr/lib/python$(PYTHON_VERSION)/site-packages $(INSTALL_DIR) $(IDIR_BZR)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/bzr \ - $(IDIR_BZR)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/bzr $(IDIR_BZR)/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk |