summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gtk/configure.ac6
-rw-r--r--gtk/module.rules10
-rw-r--r--gtk/src/Makefile.am2
3 files changed, 13 insertions, 5 deletions
diff --git a/gtk/configure.ac b/gtk/configure.ac
index bd1916a49..93208785d 100644
--- a/gtk/configure.ac
+++ b/gtk/configure.ac
@@ -214,7 +214,13 @@ fi
if test "x$use_qsv" = "xyes" ; then
HB_LIBS="$HB_LIBS -lmfx"
fi
+if test "x$PYTHON" != "x" ; then
+ HB_PYTHON="$PYTHON"
+else
+ HB_PYTHON="python2"
+fi
+AC_SUBST(HB_PYTHON)
AC_SUBST(HB_LIBS)
AC_SUBST(GHB_CFLAGS)
AC_SUBST(GHB_LIBS)
diff --git a/gtk/module.rules b/gtk/module.rules
index d4242cf5a..eaebdb3f5 100644
--- a/gtk/module.rules
+++ b/gtk/module.rules
@@ -11,15 +11,17 @@ gtk.configure: $(GTK.CONFIGURE.stamp)
$(GTK.CONFIGURE.stamp): | $(dir $(GTK.CONFIGURE.stamp))
$(GTK.CONFIGURE.stamp): $(GTK.src/)Makefile.am
+$(GTK.CONFIGURE.stamp): $(BUILD/)GNUmakefile
$(GTK.CONFIGURE.stamp): $(GTK.src/)configure.ac $(GTK.src/)src/Makefile.am
set -e; cd $(GTK.src/); NOCONFIGURE=1 ./autogen.sh
set -e; cd $(GTK.build/); $(call fn.ABSOLUTE,$(GTK.src/))configure \
$(GTK.CONFIGURE.extra) \
PKG_CONFIG_PATH=$(BUILD/)contrib/lib/pkgconfig:$(PKG_CONFIG_PATH) \
- CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D ?extra)" \
- LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O ?extra.exe)" \
- --prefix=$(PREFIX) \
- --with-hb=$(call fn.ABSOLUTE,$(BUILD/))
+ CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D ?extra)" \
+ LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O ?extra.exe)" \
+ PYTHON="$(PYTHON.exe)" \
+ --prefix=$(PREFIX) \
+ --with-hb=$(call fn.ABSOLUTE,$(BUILD/))
$(TOUCH.exe) $@
gtk.build: | $(GTK.build/)
diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 04888d306..9c3ed6b05 100644
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -171,7 +171,7 @@ resources.o: data_res.h
widget_reverse.deps: makedeps.py
widget.deps: makedeps.py
- python2 $(srcdir)/makedeps.py
+ $(HB_PYTHON) $(srcdir)/makedeps.py
fr.handbrake.ghb.appdata.xml.in: fr.handbrake.ghb.appdata.xml.template
sed -e 's^RELEASE_TAG^<release version="$(HB.version)" date="$(word 1,$(HB.repo.date))" />^' $< > $@