LinGui: make Help->Guide work on windows/mingw

[handbrake-jp/handbrake-jp-git.git] / gtk / module.rules

diff --git a/gtk/module.rules b/gtk/module.rules
index ddf9bcc..138fe64 100644 (file)
--- a/gtk/module.rules
+++ b/gtk/module.rules
@@ -2,6 +2,7 @@ $(eval $(call import.MODULE.rules,GTK))
 
 build: hgtk.build gtk.build
 install: gtk.install
+install-strip: gtk.install-strip
 uninstall: gtk.uninstall
 clean: hgtk.clean gtk.clean
 xclean: hgtk.clean gtk.xclean
@@ -12,30 +13,24 @@ $(GTK.CONFIGURE.stamp): | $(dir $(GTK.CONFIGURE.stamp))
 $(GTK.CONFIGURE.stamp): $(GTK.src/)Makefile.am
 $(GTK.CONFIGURE.stamp): $(GTK.src/)configure.ac $(GTK.src/)src/Makefile.am
        set -e; cd $(GTK.src/); NOCONFIGURE=1 ./autogen.sh
-ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
        set -e; cd $(GTK.build/); $(call fn.ABSOLUTE,$(GTK.src/))configure \
-               --host=$(BUILD.spec) \
+               $(GTK.CONFIGURE.extra) \
                PKG_CONFIG_PATH=$(BUILD/)contrib/lib/pkgconfig \
            CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D ?extra)" \
            LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O) " \
            --prefix=$(PREFIX) \
            --with-hb=$(call fn.ABSOLUTE,$(BUILD/))
-else
-       set -e; cd $(GTK.build/); $(call fn.ABSOLUTE,$(GTK.src/))configure \
-               PKG_CONFIG_PATH=$(BUILD/)contrib/lib/pkgconfig \
-           CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O ?extra)" \
-           LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O)" \
-           --prefix=$(PREFIX) \
-           --with-hb=$(call fn.ABSOLUTE,$(BUILD/))
-endif
        $(TOUCH.exe) $@
 
 gtk.build: | $(GTK.build/)
 gtk.build: $(GTK.CONFIGURE.stamp) $(LIBHB.a)
        +$(MAKE) -C $(GTK.build/)
 
+gtk.install-strip:
+       $(MAKE) -C $(GTK.build/) prefix=$(PREFIX) install-strip
+
 gtk.install:
-       $(MAKE) -C $(GTK.build/) install-strip
+       $(MAKE) -C $(GTK.build/) prefix=$(PREFIX) install
 
 gtk.uninstall:
        $(MAKE) -C $(GTK.build/) uninstall