X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2FMakefile;h=b4fb3ffe4e578dbd9c0ec461e46d0e02a17b77b4;hb=e7787c10cb2de2a6e4e67083646982d3576617f6;hp=21cf033f2f5e41673cf250cb78d02eea6fa4467a;hpb=e8fa25e2cf94586cbc881131ddaaafcab36dd9c7;p=mlt

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index 21cf033f..b4fb3ffe 100644
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -11,14 +11,14 @@ OBJS = factory.o
 
 ifdef USE_GTK2
 OBJS += consumer_gtk2.o
-CFLAGS += `pkg-config gtk+-2.0 --cflags`
-LDFLAGS += `pkg-config gtk+-2.0 --libs`
+CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags gtk+-2.0`
+LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs gtk+-2.0`
 endif
 
 ifdef USE_PIXBUF
 OBJS += producer_pixbuf.o pixops.o filter_rescale.o
-CFLAGS += `pkg-config gdk-pixbuf-2.0 --cflags`
-LDFLAGS += `pkg-config gdk-pixbuf-2.0 --libs`
+CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags gdk-pixbuf-2.0`
+LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs gdk-pixbuf-2.0`
 endif
 
 ifdef USE_EXIF
@@ -34,11 +34,17 @@ endif
 
 ifdef USE_PANGO
 OBJS += producer_pango.o
-CFLAGS += `pkg-config pangoft2 --cflags`
-LDFLAGS += `pkg-config pangoft2 --libs`
+CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags pangoft2`
+LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs pangoft2`
+ifeq ($(targetos),Darwin)
+LDFLAGS += -liconv
+endif
 ifeq ($(targetos),FreeBSD)
 LDFLAGS += -liconv
 endif
+ifeq ($(targetos), MinGW)
+LDFLAGS += -liconv
+endif
 endif
 
 SRCS := $(OBJS:.o=.c)
@@ -64,7 +70,9 @@ clean:
 		rm -f $(OBJS) $(ASM_OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/gtk2"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/gtk2"
 
 ifneq ($(wildcard .depend),)
 include .depend