diff options
| author | Dan Mueth <d-mueth@uchicago.edu> | 2001-07-28 20:10:58 +0000 |
|---|---|---|
| committer | Dan Mueth <dmueth@src.gnome.org> | 2001-07-28 20:10:58 +0000 |
| commit | ebe3528f60205d70980775683c8e31f6fd5678d9 (patch) | |
| tree | f0b032d82abb5b96f9616ff3a1d5f5ba84a2ffd5 | |
| parent | 1ba48403870b7c1ad7b5563f42dfa53e7b09d38e (diff) | |
| download | gnome-user-docs-ebe3528f60205d70980775683c8e31f6fd5678d9.tar.gz gnome-user-docs-ebe3528f60205d70980775683c8e31f6fd5678d9.tar.xz gnome-user-docs-ebe3528f60205d70980775683c8e31f6fd5678d9.zip | |
Updating doc build stuff to use jw on RH 7.1 and any other dist which has
2001-07-28 Dan Mueth <d-mueth@uchicago.edu>
Updating doc build stuff to use jw on RH 7.1 and any other dist which
has moved to docbook-utils.
* configure.in:
* sgmldocs-ug.make:
* sgmldocs.make:
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.in | 15 | ||||
| -rw-r--r-- | sgmldocs-ug.make | 9 | ||||
| -rw-r--r-- | sgmldocs.make | 21 |
4 files changed, 45 insertions, 9 deletions
@@ -1,5 +1,14 @@ 2001-07-28 Dan Mueth <d-mueth@uchicago.edu> + Updating doc build stuff to use jw on RH 7.1 and any other dist which + has moved to docbook-utils. + + * configure.in: + * sgmldocs-ug.make: + * sgmldocs.make: + +2001-07-28 Dan Mueth <d-mueth@uchicago.edu> + Fixing build stuff so that package will actually build. Problem is mostly that various files are missing for Italian user's guide. diff --git a/configure.in b/configure.in index d00a7ee..32d4214 100644 --- a/configure.in +++ b/configure.in @@ -18,6 +18,21 @@ dnl ==================================== dnl = End tests for scrollkeeper dnl ==================================== +dnl ==================================== +dnl = Test whether jw is installed +dnl ==================================== +AC_PATH_PROG(JW,jw,no) +if test x$JW = xno; then + HAVE_JW="no" +else + HAVE_JW="yes" +fi +AM_CONDITIONAL(HAVE_JW, test "x$HAVE_JW" = "xyes") +AC_SUBST(HAVE_JW) +dnl ==================================== +dnl = End tests for jw +dnl ==================================== + AC_OUTPUT([ Makefile diff --git a/sgmldocs-ug.make b/sgmldocs-ug.make index 9ea336e..d280bcb 100644 --- a/sgmldocs-ug.make +++ b/sgmldocs-ug.make @@ -66,8 +66,13 @@ $(docname).sgml: $(sgml_ents) # The weird srcdir trick is because the db2html from the Cygnus RPMs # cannot handle relative filenames $(docname)/index.html: $(srcdir)/$(docname).sgml - -srcdir=`cd $(srcdir) && pwd`; \ - db2html $$srcdir/$(docname).sgml + -srcdir=`cd $(srcdir) && pwd`; \ + if test "$(HAVE_JW)" = 'yes' ; then \ + jw -c /etc/sgml/catalog $$srcdir/$(docname).sgml -o $$srcdir/$(docname); \ + else \ + db2html $$srcdir/$(docname).sgml; \ + fi + app-dist-hook: index.html -$(mkinstalldirs) $(distdir)/$(docname)/stylesheet-images diff --git a/sgmldocs.make b/sgmldocs.make index 48b0ecd..8159f7d 100644 --- a/sgmldocs.make +++ b/sgmldocs.make @@ -66,18 +66,25 @@ $(docname).sgml: $(sgml_ents) # The weird srcdir trick is because the db2html from the Cygnus RPMs # cannot handle relative filenames $(docname)/index.html: $(srcdir)/$(docname).sgml - -srcdir=`cd $(srcdir) && pwd`; \ - db2html $$srcdir/$(docname).sgml + -srcdir=`cd $(srcdir) && pwd`; \ + if test "$(HAVE_JW)" = 'yes' ; then \ + jw -c /etc/sgml/catalog $$srcdir/$(docname).sgml -o $$srcdir/$(docname); \ + else \ + db2html $$srcdir/$(docname).sgml; \ + fi app-dist-hook: index.html -$(mkinstalldirs) $(distdir)/$(docname)/stylesheet-images -$(mkinstalldirs) $(distdir)/figures -cp $(srcdir)/$(docname)/*.html $(distdir)/$(docname) - -cp $(srcdir)/$(docname)/*.css $(distdir)/$(docname) - -cp $(srcdir)/$(docname)/stylesheet-images/*.gif \ - $(distdir)/$(docname)/stylesheet-images - -cp $(srcdir)/figures/*.png \ - $(distdir)/figures + -for file in $(srcdir)/$(docname)/*.css; do \ + basefile=`echo $$file | sed -e 's,^.*/,,'`; \ + cp $$file $(distdir)/$(docname)/$$basefile ; \ + done + -for file in $(srcdir)/$(docname)/stylesheet-images/*.gif; do \ + basefile=`echo $$file | sed -e 's,^.*/,,'`; \ + cp $$file $(distdir)/$(docname)/stylesheet-images/$$basefile ; \ + done -if [ -e topic.dat ]; then \ cp $(srcdir)/topic.dat $(distdir); \ fi |