diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-12-03 18:02:02 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-12-03 18:43:13 (GMT) |
| commit | e6c37a1a620fa622a4bb7b4a1f85b44e47e87f23 (patch) | |
| tree | aa99e0ac3286888464ec6078107fc0c91cefbe22 | |
| parent | 59f0fbd4e7b050acf0517d056d112d50a009b443 (diff) | |
Really install into right path. Closes: 485233.
| -rw-r--r-- | debian/cdbs/1/class/python-sugar.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/debian/cdbs/1/class/python-sugar.mk b/debian/cdbs/1/class/python-sugar.mk index 1a97b2f..676f64f 100644 --- a/debian/cdbs/1/class/python-sugar.mk +++ b/debian/cdbs/1/class/python-sugar.mk @@ -30,7 +30,7 @@ include debian/cdbs/1/class/python-vars.mk include $(_cdbs_rules_path)/debhelper.mk$(_cdbs_makefile_suffix) # Declare Build-Deps for packages using this file -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-sugar, python-sugar-toolkit (>= 0.81.4-2~), unzip +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-sugar, python-sugar-toolkit (>= 0.82.5), unzip # FIXME: Resolve DEB_PYTHON_PACKAGES in build targets only ifeq (,$(cdbs_python_pkg_check)$(DEB_PYTHON_ARCH_PACKAGES)) ifneq (, $(cdbs_python_compile_version)) @@ -57,13 +57,13 @@ pre-build:: $(patsubst %,build/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: build/%: for pythonver in $(cdbs_python_build_versions); do \ - /usr/bin/python$$ver $(cdbs_pkgsrcdir)/setup.py dist_xo; \ + /usr/bin/python$$ver $(cdbs_pkgsrcdir)/setup.py build; \ done $(patsubst %,install/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: install/%: mkdir -p $(DEB_DESTDIR)usr/share/sugar/activities for pythonver in $(cdbs_python_build_versions); do \ - /usr/bin/python$$ver $(cdbs_pkgsrcdir)/setup.py install --prefix=$(DEB_DESTDIR)usr/share/sugar/activities; \ + /usr/bin/python$$ver $(cdbs_pkgsrcdir)/setup.py install --prefix="$(DEB_DESTDIR)/usr"; \ done $(patsubst %,binary-install/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: binary-install/%: @@ -79,8 +79,6 @@ ifeq (, $(cdbs_selected_pycompat)) endif # use pycompat $(patsubst %,cleanpythonsugar/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: cleanpythonsugar/% : - -find "$(cdbs_pkgsrcdir)/dist" -maxdepth 1 -type f -name '*.xo' -exec rm -f '{}' ';' - -rmdir --ignore-fail-on-non-empty "$(cdbs_pkgsrcdir)/dist" -IFS="`printf '\n'`" find "$(cdbs_pkgsrcdir)/locale" -type f \( -name '*.mo' -or -name 'activity.linfo' \) | while read path; do \ rm -f "$$path"; \ rmdir --ignore-fail-on-non-empty "`dirname "$$path"`"; \ |