diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-11-30 22:25:18 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-11-30 22:25:18 +0000 |
| commit | 7acdf4277b2328796f16c58b942e98c067b8a638 (patch) | |
| tree | 0ab42a8513d23d223bdc7f020ec954ea3c1165ea /data | |
| parent | 0f59a2e9c27894680358a9c9362cd4ea98670ecb (diff) | |
| download | yelp-7acdf4277b2328796f16c58b942e98c067b8a638.tar.gz | |
Use gecko.m4 from Epiphany to detect gecko and set the various compiler
2005-11-30 Christian Persch <chpe@cvs.gnome.org>
* Makefile.am:
* autogen.sh:
* configure.in:
* data/Makefile.am:
* m4/gecko.m4:
* src/Makefile.am: Use gecko.m4 from Epiphany to detect
gecko and set the various compiler flags etc. Bug #322171.
* src/Yelper.cpp: Use nsIWebBrowserSetup to turn off the
global history. Bug #322170.
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 746565ca..f2a76751 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -22,13 +22,13 @@ EXTRA_DIST = \ scrollkeeper.xml default.css \ yelp.js +install-data-local: $(schemas_DATA) if GCONF_SCHEMAS_INSTALL -install-data-local: if test -z "$(DESTDIR)"; then \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/yelp.schemas ; \ + for p in $^ ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p >&1 > /dev/null; \ + done \ fi -else -install-data-local: endif -CLEANFILES = yelp.schemas toc.xml man.xml +CLEANFILES = $(schemas_DATA) toc.xml man.xml |