diff options
| author | Bastien Nocera <hadess@hadess.net> | 2005-08-06 18:30:02 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2005-08-06 18:30:02 +0000 |
| commit | 4d4456cc9f4e7f01c73d87e1c7e4d6f5a258a768 (patch) | |
| tree | 0a2e2c35488f3d29cd3a45cddfe9449dd06cf909 | |
| parent | b465a407859b1908948c0db282a7779e663b3435 (diff) | |
| download | gnome-bluetooth-4d4456cc9f4e7f01c73d87e1c7e4d6f5a258a768.tar.gz | |
Fix hard-coded h2def path in the Makefiles (Closes: #153429)
2005-08-06 Bastien Nocera <hadess@hadess.net>
* configure.in:
* src/Makefile.am: Fix hard-coded h2def path in the Makefiles
(Closes: #153429)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2005-08-06 Bastien Nocera <hadess@hadess.net> + + * configure.in: + * src/Makefile.am: Fix hard-coded h2def path in the Makefiles + (Closes: #153429) + 2005-08-01 Bastien Nocera <hadess@hadess.net> * configure.in: diff --git a/configure.in b/configure.in index fa655e53..794c00ec 100644 --- a/configure.in +++ b/configure.in @@ -49,6 +49,8 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) DEFSDIR=`pkg-config --variable=defsdir pygtk-2.0` AC_SUBST(DEFSDIR) +CODEGENDIR=`pkg-config --variable codegendir pygtk-2.0` +AC_SUBST(CODEGENDIR) BLUEZ_PATH_BLUETOOTH([], AC_MSG_ERROR([libbluetooth is required to build this software - part of bluez-libs])) diff --git a/src/Makefile.am b/src/Makefile.am index e9ecdcb0..0a75bc46 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -102,10 +102,10 @@ CLEANFILES = $(PYTHON_CLEANFILES) regenerate-defs: gnomebt-controller.defs gnomebt-chooser.defs gnomebt-controller.defs: gnomebt-controller.h - python /usr/share/pygtk/2.0/codegen/h2def.py -v gnomebt-controller.h > gnomebt-controller.defs + python $(CODEGENDIR)/h2def.py -v gnomebt-controller.h > gnomebt-controller.defs gnomebt-chooser.defs: gnomebt-chooser.h - python /usr/share/pygtk/2.0/codegen/h2def.py -v gnomebt-chooser.h > gnomebt-chooser.defs + python $(CODEGENDIR)/h2def.py -v gnomebt-chooser.h > gnomebt-chooser.defs gnomebt-controller-py.c: gnomebt-controller.defs gnomebt-controller.override pygtk-codegen-2.0 --prefix controller \ |