From 793a630e2f68b472876d1174815cc09e0b883a75 Mon Sep 17 00:00:00 2001 From: Rob Adams Date: Thu, 12 Jun 2003 17:41:38 +0000 Subject: [PATCH] honor --disable-schemas-install. Fix for #106123 from Julio Merino 2003-06-12 Rob Adams * src/Makefile.am: honor --disable-schemas-install. Fix for #106123 from Julio Merino --- ChangeLog | 5 +++++ src/Makefile.am | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 629c40c41..9aab27326 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-06-12 Rob Adams + + * src/Makefile.am: honor --disable-schemas-install. Fix for + #106123 from Julio Merino + 2003-06-12 Rob Adams Remove legacy support for Gnome 1 hints, since we deem it unlikely diff --git a/src/Makefile.am b/src/Makefile.am index c5fdf4ef3..c2863d2f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -148,8 +148,12 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ +if GCONF_SCHEMAS_INSTALL install-data-local: GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) +else +install-data-local: +endif IMAGES=default_icon.png stock_maximize.png stock_minimize.png stock_delete.png VARIABLES=default_icon_data $(srcdir)/default_icon.png \