Add DESTDIR variable.

This commit is contained in:
Christophe Merlet 2004-01-16 12:00:37 +00:00
parent 2119d07f8d
commit 4f23b6a087
4 changed files with 11 additions and 3 deletions

View file

@ -1,3 +1,7 @@
2004-01-16 Christophe Merlet <redfox@redfoxcenter.org>
* Makefile.am: add DESTDIR variable in install-data-local section.
2004-01-14 Jody Goldberg <jody@gnome.org>
* Release 2.5.2

View file

@ -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)

View file

@ -1,3 +1,7 @@
2004-01-16 Christophe Merlet <redfox@redfoxcenter.org>
* Makefile.am: Add DESTDIR variable in install-data-hook section.
2004-01-15 Bastien Nocera <hadess@hadess.net>
* gnome-settings-multimedia-keys.c: fix locating the

View file

@ -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)