diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/Makefile.am | 8 | ||||
| -rw-r--r-- | ext/gdk_pixbuf/Makefile.am | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am index d70a37e8..a26660d7 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -196,6 +196,12 @@ else MPLEX_DIR= endif +if USE_OGG +OGG_DIR=ogg +else +OGG_DIR= +endif + if USE_PANGO PANGO_DIR=pango else @@ -313,6 +319,7 @@ SUBDIRS=\ $(MIKMOD_DIR) \ $(MPEG2DEC_DIR) \ $(MPLEX_DIR) \ + $(OGG_DIR) \ $(PANGO_DIR) \ $(RAW1394_DIR) \ $(SDL_DIR) \ @@ -361,6 +368,7 @@ DIST_SUBDIRS=\ mikmod \ mpeg2dec \ mplex \ + ogg \ pango \ raw1394 \ sdl \ diff --git a/ext/gdk_pixbuf/Makefile.am b/ext/gdk_pixbuf/Makefile.am index b017fa56..82e0d3ef 100644 --- a/ext/gdk_pixbuf/Makefile.am +++ b/ext/gdk_pixbuf/Makefile.am @@ -8,7 +8,7 @@ libgstgdkpixbuf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) if HAVE_GDK_LOADERS -loaderdir = $(GDK_PIXBUF_LOADER_DIR) +loaderdir = $(DESTDIR)$(GDK_PIXBUF_LOADER_DIR) loader_LTLIBRARIES = gst_loader.la gst_loader_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -DGDK_PIXBUF_ENABLE_BACKEND @@ -20,11 +20,11 @@ gst_loader_la_LIBADD = $(GTK_LIBS) $(GST_LIBS) gst_loader_headers = gstgdkanimation.h -#install-data-hook: -# if test -z "$(DESTDIR)" ; then -# $(mkinstalldirs) $(DESTDIR)$(GDK_PIXBUF_SYSCONFDIR)/gtk-2.0 ; \ -# $(QUERYLOADERS) > $(DESTDIR)$(GDK_PIXBUF_SYSCONFDIR)/gtk-2.0/gdk-pixbuf.loaders ; \ -# fi +install-data-hook: + if test -z "$(DESTDIR)" ; then \ + $(mkinstalldirs) $(DESTDIR)$(GDK_PIXBUF_SYSCONFDIR)/gtk-2.0 ; \ + $(QUERYLOADERS) > $(DESTDIR)$(GDK_PIXBUF_SYSCONFDIR)/gtk-2.0/gdk-pixbuf.loaders ; \ + fi else gst_loader_headers = |