diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-05-14 22:08:07 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-05-14 22:08:07 +0200 |
| commit | 0c04b17a4cf2f189d3dae44667b42ba78435a06e (patch) | |
| tree | ff771a3bab49182a49dca3c5eb47d0ddc62723cc | |
| parent | f9b47129ec1c5c8e24659b54970b9ee194899cd2 (diff) | |
| download | experiment-player-0c04b17a4cf2f189d3dae44667b42ba78435a06e.tar.gz | |
install widget catalogs into Glade-3 catalog directory if possible
* eases installation on Linux
* on MinGW where Glade-3 is in its own hierarchy, this will probably not work, but there's a fallback to install the catalogs into PREFIX/share directories
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | lib/gtk-experiment-widgets/Makefile.am | 3 | ||||
| -rw-r--r-- | lib/gtk-vlc-player/Makefile.am | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index c99ffcb..4034faa 100644 --- a/configure.ac +++ b/configure.ac @@ -62,6 +62,13 @@ PKG_CHECK_MODULES(LIBGLIB, [gobject-2.0 glib-2.0]) PKG_CHECK_MODULES(LIBGTK, [gtk+-2.0]) +PKG_CHECK_EXISTS([gladeui-1.0], + [glade3_catalogsdir=`$PKG_CONFIG --variable=catalogdir gladeui-1.0`]) +if [[ x$glade3_catalogsdir = x ]]; then + AC_MSG_WARN([Glade-3 catalog directory not found, installing Gtk+ widget catalogs into custom directories!]) +fi +AC_SUBST(glade3_catalogsdir) + # FIXME: further restrict libvlc version PKG_CHECK_MODULES(LIBVLC, [libvlc >= 1.1.13 vlc-plugin]) diff --git a/lib/gtk-experiment-widgets/Makefile.am b/lib/gtk-experiment-widgets/Makefile.am index 2e1934e..025df6b 100644 --- a/lib/gtk-experiment-widgets/Makefile.am +++ b/lib/gtk-experiment-widgets/Makefile.am @@ -21,7 +21,8 @@ libgtk_experiment_widgets_la_LIBADD += @top_srcdir@/lib/experiment-reader/libexp include_HEADERS = gtk-experiment-navigator.h -dist_player_data_DATA = gtk-experiment-widgets-catalog.xml +glade3_catalogsdir ?= $(player_datadir)/catalogs +dist_glade3_catalogs_DATA = gtk-experiment-widgets-catalog.xml dist_noinst_DATA = cclosure-marshallers.list CLEANFILES = $(BUILT_SOURCES) diff --git a/lib/gtk-vlc-player/Makefile.am b/lib/gtk-vlc-player/Makefile.am index 1f27aa5..831257b 100644 --- a/lib/gtk-vlc-player/Makefile.am +++ b/lib/gtk-vlc-player/Makefile.am @@ -16,7 +16,8 @@ libgtk_vlc_player_la_LDFLAGS = -no-undefined -shared -bindir @bindir@ \ include_HEADERS = gtk-vlc-player.h -dist_vlcplayer_data_DATA = gtk-vlc-player-catalog.xml +glade3_catalogsdir ?= $(vlcplayer_datadir)/catalogs +dist_glade3_catalogs_DATA = gtk-vlc-player-catalog.xml dist_noinst_DATA = cclosure-marshallers.list CLEANFILES = $(BUILT_SOURCES) |