diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog index 25090c74d..82ce5f714 100644 --- a/capplets/background/ChangeLog +++ b/capplets/background/ChangeLog @@ -1,3 +1,7 @@ +2001-07-31 Chema Celorio + + * Makefile.am (cappletname): add DISTDIR to install-data-local + 2001-07-27 Bradford Hovinen * background-properties-capplet.c (get_legacy_settings): Fix diff --git a/capplets/background/Makefile.am b/capplets/background/Makefile.am index 3599f0c56..c978c7b6e 100644 --- a/capplets/background/Makefile.am +++ b/capplets/background/Makefile.am @@ -47,8 +47,8 @@ $(desktop).in: %.desktop.in: %.desktop.in.in sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in install-data-local: - $(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup) - $(INSTALL_DATA) $(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop) + $(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup) + $(INSTALL_DATA) $(desktop) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup)$(desktop) install-data-am: install-data-local ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog index a664b3abc..368ffb641 100644 --- a/capplets/default-applications/ChangeLog +++ b/capplets/default-applications/ChangeLog @@ -1,3 +1,7 @@ +2001-07-31 Chema Celorio + + * Makefile.am (cappletname): add DISTDIR to install-data-local + 2001-07-27 Bradford Hovinen * RELEASE : 1.5.2 diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am index 1bc11287d..9ad1e7745 100644 --- a/capplets/default-applications/Makefile.am +++ b/capplets/default-applications/Makefile.am @@ -22,8 +22,8 @@ $(desktop).in: %.desktop.in: %.desktop.in.in sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in install-data-local: - $(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup) - $(INSTALL_DATA) $(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop) + $(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup) + $(INSTALL_DATA) $(desktop) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup)$(desktop) install-data-am: install-data-local ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog index 07687a2de..e699d02a7 100644 --- a/capplets/keyboard/ChangeLog +++ b/capplets/keyboard/ChangeLog @@ -1,3 +1,7 @@ +2001-07-31 Chema Celorio + + * Makefile.am (cappletname): add DISTDIR to install-data-local + 2001-07-27 Bradford Hovinen * RELEASE : 1.5.2 diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am index 89b2d97c6..b8e966d83 100644 --- a/capplets/keyboard/Makefile.am +++ b/capplets/keyboard/Makefile.am @@ -42,8 +42,8 @@ $(desktop).in: %.desktop.in: %.desktop.in.in sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in install-data-local: - $(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup) - $(INSTALL_DATA) $(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop) + $(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup) + $(INSTALL_DATA) $(desktop) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup)$(desktop) install-data-am: install-data-local ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog index 2384595cd..d461fa827 100644 --- a/capplets/mouse/ChangeLog +++ b/capplets/mouse/ChangeLog @@ -1,3 +1,7 @@ +2001-07-31 Chema Celorio + + * Makefile.am (cappletname): add DISTDIR to install-data-local + 2001-07-27 Bradford Hovinen * mouse-properties-capplet.c (apply_settings): Use MAX_THRESH - diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am index 23009ce47..84dacff0c 100644 --- a/capplets/mouse/Makefile.am +++ b/capplets/mouse/Makefile.am @@ -40,8 +40,8 @@ $(desktop).in: %.desktop.in: %.desktop.in.in sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in install-data-local: - $(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup) - $(INSTALL_DATA) $(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop) + $(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup) + $(INSTALL_DATA) $(desktop) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup)$(desktop) install-data-am: install-data-local ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ diff --git a/capplets/screensaver/ChangeLog b/capplets/screensaver/ChangeLog index 941e79c30..ef0d2dfd4 100644 --- a/capplets/screensaver/ChangeLog +++ b/capplets/screensaver/ChangeLog @@ -1,3 +1,7 @@ +2001-07-31 Chema Celorio + + * Makefile.am (cappletname): add DISTDIR to install-data-local + 2001-07-27 Richard Hestilow * prefs-widget.c (random_timeout_cb): Don't go into an infinite diff --git a/capplets/screensaver/Makefile.am b/capplets/screensaver/Makefile.am index 28cc54f85..fbac825bc 100644 --- a/capplets/screensaver/Makefile.am +++ b/capplets/screensaver/Makefile.am @@ -31,8 +31,8 @@ $(desktop).in: %.desktop.in: %.desktop.in.in sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in install-data-local: - $(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup) - $(INSTALL_DATA) $(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop) + $(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup) + $(INSTALL_DATA) $(desktop) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup)$(desktop) install-data-am: install-data-local ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog index ae126eb3b..b79de4e62 100644 --- a/capplets/sound/ChangeLog +++ b/capplets/sound/ChangeLog @@ -1,3 +1,7 @@ +2001-07-31 Chema Celorio + + * Makefile.am (cappletname): add DISTDIR to install-data-local + 2001-07-27 Bradford Hovinen * RELEASE : 1.5.2 diff --git a/capplets/sound/Makefile.am b/capplets/sound/Makefile.am index d300b993b..d50f9eaf2 100644 --- a/capplets/sound/Makefile.am +++ b/capplets/sound/Makefile.am @@ -46,8 +46,8 @@ $(desktop).in: %.desktop.in: %.desktop.in.in sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in install-data-local: - $(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup) - $(INSTALL_DATA) $(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop) + $(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup) + $(INSTALL_DATA) $(desktop) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup)$(desktop) install-data-am: install-data-local ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@ diff --git a/control-center/ChangeLog b/control-center/ChangeLog index 84abbf4ea..0566dcd90 100644 --- a/control-center/ChangeLog +++ b/control-center/ChangeLog @@ -1,3 +1,7 @@ +2001-07-31 Chema Celorio + + * Makefile.am (cappletname): add DISTDIR to install-data-local + 2001-07-28 Carlos Perelló Marín * capplet-dir-view-html.c: Reverted my utf patch. Sorry :-( diff --git a/control-center/Makefile.am b/control-center/Makefile.am index bd7dc1a7d..3d400a0f3 100644 --- a/control-center/Makefile.am +++ b/control-center/Makefile.am @@ -65,8 +65,8 @@ $(groups_files): %.directory: %.directory.in $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< $@ install-data-local: - $(mkinstalldirs) $(datadir)/control-center/capplets - $(INSTALL_DATA) Gnome.directory $(datadir)/control-center/capplets/.directory + $(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/capplets + $(INSTALL_DATA) Gnome.directory $(DESTDIR)$(datadir)/control-center/capplets/.directory @@ -90,4 +90,4 @@ install-data-local: -#all-local: Gnome.directory \ No newline at end of file +#all-local: Gnome.directory