From 4f23b6a087d8f3bfc937a09fd0c870c58900214b Mon Sep 17 00:00:00 2001 From: Christophe Merlet Date: Fri, 16 Jan 2004 12:00:37 +0000 Subject: [PATCH] Add DESTDIR variable. --- capplets/background/ChangeLog | 4 ++++ capplets/background/Makefile.am | 2 +- gnome-settings-daemon/ChangeLog | 4 ++++ gnome-settings-daemon/Makefile.am | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog index 1aabb8353..bcc3f00ba 100644 --- a/capplets/background/ChangeLog +++ b/capplets/background/ChangeLog @@ -1,3 +1,7 @@ +2004-01-16 Christophe Merlet + + * Makefile.am: add DESTDIR variable in install-data-local section. + 2004-01-14 Jody Goldberg * Release 2.5.2 diff --git a/capplets/background/Makefile.am b/capplets/background/Makefile.am index 95daf2fd7..5fc558556 100644 --- a/capplets/background/Makefile.am +++ b/capplets/background/Makefile.am @@ -29,7 +29,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ install-data-local: - $(mkinstalldirs) $(WALLPAPER_DATADIR) + $(mkinstalldirs) $(DESTDIR)$(WALLPAPER_DATADIR) EXTRA_DIST = \ $(desktop_in_files) diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index e2fb06bfb..8cb0f4cec 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,7 @@ +2004-01-16 Christophe Merlet + + * Makefile.am: Add DESTDIR variable in install-data-hook section. + 2004-01-15 Bastien Nocera * gnome-settings-multimedia-keys.c: fix locating the diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am index 726f75810..7b0f33188 100644 --- a/gnome-settings-daemon/Makefile.am +++ b/gnome-settings-daemon/Makefile.am @@ -95,8 +95,8 @@ $(CORBA_GENERATED): $(idl_dir)/GNOME_SettingsDaemon.idl $(ORBIT_IDL) serverfile = GNOME_SettingsDaemon.server.in serverdir = $(libdir)/bonobo/servers install-data-hook : - $(mkinstalldirs) $(serverdir) - sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $(srcdir)/$(serverfile) > $(serverdir)/$(serverfile:.in=) + $(mkinstalldirs) $(DESTDIR)$(serverdir) + sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $(srcdir)/$(serverfile) > $(DESTDIR)$(serverdir)/$(serverfile:.in=) EXTRA_DIST = $(serverfile) CLEANFILES = $(BUILT_SOURCES)