summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Leach <leach@wam.umd.edu>2004-02-10 07:52:07 +0000
committerJacob Leach <jleach@src.gnome.org>2004-02-10 07:52:07 +0000
commit6f02d4ae8dcb03de4dc0531b84abb9a0bb93feca (patch)
tree1bf8cf7a02f838b66134742cec78126888163441
parentf6541a5063f823791d06510f8e8bc0f385f9e564 (diff)
downloadnautilus-6f02d4ae8dcb03de4dc0531b84abb9a0bb93feca.tar.gz
Don't install a schema if the user configures with
2004-02-10 Jason Leach <leach@wam.umd.edu> * libnautilus-private/Makefile.am (install-data-local): Don't install a schema if the user configures with --disable-schemas-install (#106220, Julio Merino)
-rw-r--r--ChangeLog7
-rw-r--r--libnautilus-private/Makefile.am3
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cc4986fd5..937a6febe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-10 Jason Leach <leach@wam.umd.edu>
+
+ * libnautilus-private/Makefile.am (install-data-local): Don't
+ install a schema if the user configures with
+ --disable-schemas-install
+ (#106220, Julio Merino)
+
2004-02-09 Christian Rose <menthos@menthos.com>
* configure.in: Added "mi" to ALL_LINGUAS.
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 4af651e5f..3cc627165 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -214,13 +214,14 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
# don't do this if we are building in eg. rpm
+if GCONF_SCHEMAS_INSTALL
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
done \
fi
-
+endif
EXTRA_DIST = \
$(fsattributes_DATA) \