diff options
| author | Rob Adams <robadams@ucla.edu> | 2003-06-12 17:41:38 +0000 |
|---|---|---|
| committer | Rob Adams <readams@src.gnome.org> | 2003-06-12 17:41:38 +0000 |
| commit | 793a630e2f68b472876d1174815cc09e0b883a75 (patch) | |
| tree | c5f931dc1bf0accf4c7c00fadfc7d453c9993a39 | |
| parent | 2936391fc80d656b6f44b3079d251cc6db98fc99 (diff) | |
| download | metacity-793a630e2f68b472876d1174815cc09e0b883a75.tar.gz | |
honor --disable-schemas-install. Fix for #106123 from Julio Merino
2003-06-12 Rob Adams <robadams@ucla.edu>
* src/Makefile.am: honor --disable-schemas-install. Fix for
#106123 from Julio Merino
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 9 insertions, 0 deletions
@@ -1,5 +1,10 @@ 2003-06-12 Rob Adams <robadams@ucla.edu> + * src/Makefile.am: honor --disable-schemas-install. Fix for + #106123 from Julio Merino + +2003-06-12 Rob Adams <robadams@ucla.edu> + Remove legacy support for Gnome 1 hints, since we deem it unlikely that anyone is running a current metacity with Gnome 1. The removed hints are _WIN_WORKSPACE, _WIN_LAYER, _WIN_PROTOCOLS, diff --git a/src/Makefile.am b/src/Makefile.am index c5fdf4ef..c2863d2f 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 \ |