diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2001-04-24 04:45:39 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2001-04-24 04:45:39 +0800 |
| commit | 23faa57aef230148a5ab1c746a325be4ba029b02 (patch) | |
| tree | dd19bfce5c2544a302f56935d78e45a1afec0c15 /help | |
| parent | 159c8dbad99652984fd19dccbb1947712088d1e0 (diff) | |
| download | gsoc2013-evolution-23faa57aef230148a5ab1c746a325be4ba029b02.tar gsoc2013-evolution-23faa57aef230148a5ab1c746a325be4ba029b02.tar.gz gsoc2013-evolution-23faa57aef230148a5ab1c746a325be4ba029b02.tar.bz2 gsoc2013-evolution-23faa57aef230148a5ab1c746a325be4ba029b02.tar.lz gsoc2013-evolution-23faa57aef230148a5ab1c746a325be4ba029b02.tar.xz gsoc2013-evolution-23faa57aef230148a5ab1c746a325be4ba029b02.tar.zst gsoc2013-evolution-23faa57aef230148a5ab1c746a325be4ba029b02.zip | |
Port builddir != srcdir patch from the evolution-0-10-branch.
svn path=/trunk/; revision=9522
Diffstat (limited to 'help')
| -rw-r--r-- | help/C/Makefile.am | 2 | ||||
| -rw-r--r-- | help/ChangeLog | 4 | ||||
| -rw-r--r-- | help/devel/ChangeLog | 9 | ||||
| -rw-r--r-- | help/devel/calendar/cal-client/Makefile.am | 2 | ||||
| -rw-r--r-- | help/devel/calendar/cal-util/Makefile.am | 2 | ||||
| -rw-r--r-- | help/devel/executive-summary/Makefile.am | 8 |
6 files changed, 20 insertions, 7 deletions
diff --git a/help/C/Makefile.am b/help/C/Makefile.am index 486a10ca58..6aa9035909 100644 --- a/help/C/Makefile.am +++ b/help/C/Makefile.am @@ -22,7 +22,7 @@ EXTRA_DIST = \ all: evolution-guide evolution-guide: $(SGML_FILES) - -db2html evolution.sgml + -db2html $(srcdir)/evolution.sgml dist-hook: mkdir $(distdir)/evolution diff --git a/help/ChangeLog b/help/ChangeLog index e88fca6898..16226fafc1 100644 --- a/help/ChangeLog +++ b/help/ChangeLog @@ -1,5 +1,9 @@ 2001-04-23 Ettore Perazzoli <ettore@ximian.com> + * C/Makefile.am (evolution-guide): Use `$(srcdir)' here. + +2001-04-23 Ettore Perazzoli <ettore@ximian.com> + * C/Makefile.am (SGML_FILES): Add `evolution.sgml'. (evolution-guide): Process `evolution.sgml', not `evolution-guide.sgml'. diff --git a/help/devel/ChangeLog b/help/devel/ChangeLog index 0237e82112..74c7e4070d 100644 --- a/help/devel/ChangeLog +++ b/help/devel/ChangeLog @@ -1,5 +1,14 @@ 2001-04-23 Ettore Perazzoli <ettore@ximian.com> + * executive-summary/Makefile.am (scan) [ENABLE_GTK_DOC]: Kludge + builddir != srcdir behavior by symlinking the $(DOC_MODULE).types + file into the builddir. + * calendar/cal-client/Makefile.am (scan) [ENABLE_GTK_DOC]: + Likewise. + * calendar/cal-util/Makefile.am (scan) [ENABLE_GTK_DOC]: Likewise. + +2001-04-23 Ettore Perazzoli <ettore@ximian.com> + * evolution-devel-guide.sgml: Disable the importer references here too. diff --git a/help/devel/calendar/cal-client/Makefile.am b/help/devel/calendar/cal-client/Makefile.am index 9e02b21f9b..109bdcc241 100644 --- a/help/devel/calendar/cal-client/Makefile.am +++ b/help/devel/calendar/cal-client/Makefile.am @@ -89,7 +89,7 @@ all: $(sgml_generated) if ENABLE_GTK_DOC scan $(scan_generated): $(SOURCE_FILES) - -(cd $(srcdir) \ + -(ln -sf $(srcdir)/$(DOC_MODULE).types . \ && env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \ gtkdoc-scanobj --module=$(DOC_MODULE) \ && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) \ diff --git a/help/devel/calendar/cal-util/Makefile.am b/help/devel/calendar/cal-util/Makefile.am index 227fbb1a9c..291cb46f2d 100644 --- a/help/devel/calendar/cal-util/Makefile.am +++ b/help/devel/calendar/cal-util/Makefile.am @@ -100,7 +100,7 @@ all: $(sgml_generated) if ENABLE_GTK_DOC scan $(scan_generated): $(SOURCE_FILES) - -(cd $(srcdir) \ + -(ln -sf $(srcdir)/$(DOC_MODULE).types . \ && env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \ gtkdoc-scanobj --module=$(DOC_MODULE) \ && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) \ diff --git a/help/devel/executive-summary/Makefile.am b/help/devel/executive-summary/Makefile.am index 38664929d8..a310f6c917 100644 --- a/help/devel/executive-summary/Makefile.am +++ b/help/devel/executive-summary/Makefile.am @@ -83,10 +83,10 @@ all: $(sgml_generated) if ENABLE_GTK_DOC scan $(scan_generated): $(SOURCE_FILES) - -(cd $(srcdir) \ - && env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \ - gtkdoc-scanobj --module=$(DOC_MODULE) \ - && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) \ + -(ln -sf $(srcdir)/$(DOC_MODULE).types . \ + && env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \ + gtkdoc-scanobj --module=$(DOC_MODULE) \ + && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) \ --ignore-headers="$(IGNORED_HEADER_FILES)" ) templates $(tmpl_sources) $(tmpl_generated): $(tmpl_dependencies) |