diff options
| author | Owen Taylor <otaylor@redhat.com> | 2007-10-22 22:40:18 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2007-10-22 22:40:18 +0000 |
| commit | 0deff5501bb608556d0946e205d73c6adf0d4fee (patch) | |
| tree | 4dea5e1b6678a3de9c15ebec42bf1cdaeea5c688 | |
| parent | 36fbe777074a006a6f53f5cb11ba666195c1146c (diff) | |
| download | gconf-0deff5501bb608556d0946e205d73c6adf0d4fee.tar.gz | |
If there is an existing path configuration file, don't overwrite it, to
2007-10-22 Owen Taylor <otaylor@redhat.com>
* gconf/Makefile.am (install-data-local): If there is an existing
path configuration file, don't overwrite it, to make it possible,
for example, to have a jhbuild that properly deals with
system-installed schemas. (#489193)
svn path=/trunk/; revision=2490
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gconf/Makefile.am | 6 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2007-10-22 Owen Taylor <otaylor@redhat.com> + + * gconf/Makefile.am (install-data-local): If there is an existing + path configuration file, don't overwrite it, to make it possible, + for example, to have a jhbuild that properly deals with + system-installed schemas. (#489193) + 2007-10-23 Lucas Rocha <lucasr@gnome.org> * gconf/gconf-sanity-check.c (main): fix regression that requires a diff --git a/gconf/Makefile.am b/gconf/Makefile.am index 09233b0f..0b223cae 100644 --- a/gconf/Makefile.am +++ b/gconf/Makefile.am @@ -129,7 +129,11 @@ default.path: $(srcdir)/default.path.in install-data-local: default.path $(mkinstalldirs) $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION) - $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path + if test -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path; then \ + echo "Existing path configuration file not changed"; \ + else \ + $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path; \ + fi uninstall-local: rm -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path |