diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-12-18 10:09:45 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-12-18 10:09:45 +0000 |
| commit | b0c32238e40d4d2f50c570fe35dba07c3f7fe47b (patch) | |
| tree | 980d2c1511bc900a9cb2ab1cb755d38928c08d66 | |
| parent | 38b1504c252f904b47534d775eddbb479018f33c (diff) | |
| download | totem-b0c32238e40d4d2f50c570fe35dba07c3f7fe47b.tar.gz | |
Fixes for builddir != srcdir.
2005-12-18 Christian Persch <chpe@cvs.gnome.org>
* data/Makefile.am:
* src/Makefile.am:
* src/plparse/Makefile.am: Fixes for builddir != srcdir.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | data/Makefile.am | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/plparse/Makefile.am | 1 |
4 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2005-12-18 Christian Persch <chpe@cvs.gnome.org> + + * data/Makefile.am: + * src/Makefile.am: + * src/plparse/Makefile.am: Fixes for builddir != srcdir. + 2005-12-17 Bastien Nocera <hadess@hadess.net> * data/popup.glade: add image for the Play/Pause popup menu item diff --git a/data/Makefile.am b/data/Makefile.am index afef95a01..a905facee 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -43,13 +43,13 @@ else desktop_in_files = totem.desktop.in endif -desktopdir = $(datadir)/applications/ +desktopdir = $(datadir)/applications desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ totem.desktop.in: totem.desktop.in.in mime-type-list.txt desktop.sh - cat $(srcdir)/totem.desktop.in.in > totem.desktop.in &&\ - $(srcdir)/desktop.sh $(srcdir)/mime-type-list.txt \ + cat totem.desktop.in.in > totem.desktop.in &&\ + $(SHELL) $(srcdir)/desktop.sh $(srcdir)/mime-type-list.txt \ >> totem.desktop.in noinst_HEADERS = totem-mime-types.h diff --git a/src/Makefile.am b/src/Makefile.am index 18a0313d3..e2cd815cb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -196,6 +196,8 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(srcdir)/plparse \ -I$(srcdir)/backend \ + -I$(top_builddir)/src/plparse \ + -I$(top_builddir)/src/backend \ $(EXTRA_GNOME_CFLAGS) \ -DDBUS_API_SUBJECT_TO_CHANGE \ $(DBUS_CFLAGS) \ diff --git a/src/plparse/Makefile.am b/src/plparse/Makefile.am index 5f68403bc..031c5d121 100644 --- a/src/plparse/Makefile.am +++ b/src/plparse/Makefile.am @@ -2,6 +2,7 @@ noinst_PROGRAMS = test-parser INCLUDES = \ -I$(top_srcdir) \ + -I$(top_builddir)/src/plparser \ $(EXTRA_GNOME_CFLAGS) test_parser_SOURCES = test-parser.c |