diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-05-14 23:36:35 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-05-14 23:36:35 +0200 |
| commit | 918d6bccfb5f54f9e7ae3b63a9771ed6fff70426 (patch) | |
| tree | b1a3f0131f95fa5e4b682d98cb7fc580954492f2 /lib | |
| parent | 0c04b17a4cf2f189d3dae44667b42ba78435a06e (diff) | |
| download | gtk-vlc-player-918d6bccfb5f54f9e7ae3b63a9771ed6fff70426.tar.gz | |
fixed installing catalog files into Glade-3 module dir or fallback dir
for various obscure technical reasons, it turned out to be necessary to
define the catalog directory in the autoconf file
* also use the AM_COND_IF macro whereever possible
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gtk-experiment-widgets/Makefile.am | 3 | ||||
| -rw-r--r-- | lib/gtk-vlc-player/Makefile.am | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/gtk-experiment-widgets/Makefile.am b/lib/gtk-experiment-widgets/Makefile.am index 025df6b..5074c56 100644 --- a/lib/gtk-experiment-widgets/Makefile.am +++ b/lib/gtk-experiment-widgets/Makefile.am @@ -21,8 +21,7 @@ libgtk_experiment_widgets_la_LIBADD += @top_srcdir@/lib/experiment-reader/libexp include_HEADERS = gtk-experiment-navigator.h -glade3_catalogsdir ?= $(player_datadir)/catalogs -dist_glade3_catalogs_DATA = gtk-experiment-widgets-catalog.xml +dist_gtk_experiment_widgets_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 831257b..6dd424b 100644 --- a/lib/gtk-vlc-player/Makefile.am +++ b/lib/gtk-vlc-player/Makefile.am @@ -1,7 +1,5 @@ AM_CFLAGS = -Wall -vlcplayer_datadir = @datarootdir@/gtk-vlc-player - BUILT_SOURCES = cclosure-marshallers.c cclosure-marshallers.h lib_LTLIBRARIES = libgtk-vlc-player.la @@ -16,8 +14,7 @@ libgtk_vlc_player_la_LDFLAGS = -no-undefined -shared -bindir @bindir@ \ include_HEADERS = gtk-vlc-player.h -glade3_catalogsdir ?= $(vlcplayer_datadir)/catalogs -dist_glade3_catalogs_DATA = gtk-vlc-player-catalog.xml +dist_gtk_vlc_player_catalogs_DATA = gtk-vlc-player-catalog.xml dist_noinst_DATA = cclosure-marshallers.list CLEANFILES = $(BUILT_SOURCES) |