Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 108880 | Differences between
and this patch

Collapse All | Expand All

(-)gnome-bluetooth-0.6.0.orig/acinclude.m4 (-2 / +2 lines)
Lines 103-109 Link Here
103 
  dnl then the old $(pythondir) was pretty useless.
 103 
  dnl then the old $(pythondir) was pretty useless.
104 
  AC_SUBST(pythondir)
 104 
  AC_SUBST(pythondir)
105 
  pythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION/site-packages
 105 
  pythondir=$libdir"/python"$PYTHON_VERSION/site-package
106 
  dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
 106 
  dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
107 
  dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
 107 
  dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
Lines 117-123 Link Here
117 
  dnl   (shared libraries)  Was PYTHON_SITE_EXEC in previous betas.
 117 
  dnl   (shared libraries)  Was PYTHON_SITE_EXEC in previous betas.
118 
  AC_SUBST(pyexecdir)
 118 
  AC_SUBST(pyexecdir)
119 
  pyexecdir=$PYTHON_EXEC_PREFIX"/lib/python"$PYTHON_VERSION/site-packages
 119 
  pyexecdir=$libdir"/python"$PYTHON_VERSION/site-packages
120 
  dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
 120 
  dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
121 
  dnl   Maybe this should be put in python.am?
 121 
  dnl   Maybe this should be put in python.am?
(-)gnome-bluetooth-0.6.0.orig/aclocal.m4 (-2 / +2 lines)
Lines 110-116 Link Here
110 
  dnl then the old $(pythondir) was pretty useless.
 110 
  dnl then the old $(pythondir) was pretty useless.
111 
  AC_SUBST(pythondir)
 111 
  AC_SUBST(pythondir)
112 
  pythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION/site-packages
 112 
  pythondir=$libdir"/python"$PYTHON_VERSION/site-package
113 
  dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
 113 
  dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
114 
  dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
 114 
  dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
Lines 124-130 Link Here
124 
  dnl   (shared libraries)  Was PYTHON_SITE_EXEC in previous betas.
 124 
  dnl   (shared libraries)  Was PYTHON_SITE_EXEC in previous betas.
125 
  AC_SUBST(pyexecdir)
 125 
  AC_SUBST(pyexecdir)
126 
  pyexecdir=$PYTHON_EXEC_PREFIX"/lib/python"$PYTHON_VERSION/site-packages
 126 
  pyexecdir=$libdir"/python"$PYTHON_VERSION/site-packages
127 
  dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
 127 
  dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
128 
  dnl   Maybe this should be put in python.am?
 128 
  dnl   Maybe this should be put in python.am?
(-)gnome-bluetooth-0.6.0.orig/python/Makefile.am (-2 / +2 lines)
Lines 1-7 Link Here
1 
pythondir = $(PYTHON_PREFIX)/lib/python$(PYTHON_VERSION)/site-packages/gnomebt
 1 
libdir = @libdir@
2 
pythondir = $(libdir)/python$(PYTHON_VERSION)/site-packages/gnomebt
2 
pkgpythondir = $(pythondir)
 3 
pkgpythondir = $(pythondir)
3 
libdir = $(pkgpythondir)
4 
python_LTLIBRARIES = iconlist.la
 4 
python_LTLIBRARIES = iconlist.la
(-)gnome-bluetooth-0.6.0.orig/src/Makefile.am (-1 / +1 lines)
Lines 118-124 Link Here
118 
               --override $(srcdir)/gnomebt-chooser.override \
 118 
               --override $(srcdir)/gnomebt-chooser.override \
119 
               $(srcdir)/gnomebt-chooser.defs > $@
 119 
               $(srcdir)/gnomebt-chooser.defs > $@
120 
pydir = $(PYTHON_PREFIX)/lib/python$(PYTHON_VERSION)/site-packages/gnomebt/
 120 
pydir = $(libdir)/python$(PYTHON_VERSION)/site-packages/gnomebt/
121 
controller_la_SOURCES = gnomebt-controller-py.c gnomebt-controller-pymodule.c
 121 
controller_la_SOURCES = gnomebt-controller-py.c gnomebt-controller-pymodule.c
122 
controller_la_LIBADD =  libgnomebt.la
 122 
controller_la_LIBADD =  libgnomebt.la

Return to bug 108880