merging 1.2 branch into main trunk

[ginac.git] / doc / tutorial / Makefile.am

diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index 2ddabe8ee4152e594b854e20bf20d1b6f00237bd..d3c1afa06ba2cb15a5d607f3e7f497b144ddb14a 100644 (file)
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -11,7 +11,7 @@ SUFFIXES = .fig .png .eps .txt
 .fig.eps:
        @if [ "${FIG2DEV}" ]; then \
          echo "Running ${FIG2DEV} -L eps -m 0.9 $< $@..."; \
-         cd $(srcdir) && ${FIG2DEV} -L eps -m 0.9 $< $@; \
+         ${FIG2DEV} -L eps -m 0.9 $< $@; \
        else \
          echo "warning: fig2dev was not found by configure"; \
        fi
@@ -19,7 +19,7 @@ SUFFIXES = .fig .png .eps .txt
 .fig.png:
        @if [ "${FIG2DEV}" ]; then \
          echo "Running ${FIG2DEV} -L png $< $@..."; \
-         cd $(srcdir) && ${FIG2DEV} -L png $< $@; \
+         ${FIG2DEV} -L png $< $@; \
        else \
          echo "warning: fig2dev was not found by configure"; \
        fi
@@ -29,21 +29,20 @@ info_TEXINFOS = ginac.texi
 ginac.dvi: $(EPS)
 
 ginac.html: ginac.texi version.texi $(PNG)
-       cd $(srcdir) \
-         && $(MAKEINFO) --html `echo $< | sed 's,.*/,,'`
+       $(MAKEINFO) --html $< -I ${srcdir}
 
-ginacdocdir = $(datadir)/doc/GiNaC
-ginactutorialdir = $(ginacdocdir)/tutorial
+ginactutorialdir = `test -z "@TUTORIAL_TARGETS@" || echo @datadir@/doc/GiNaC/tutorial`
 ginactutorial_DATA = @TUTORIAL_TARGETS@
 
 CLEANFILES = $(EPS) $(PNG) ginac.html
 EXTRA_DIST = $(FIG) $(TXT)
 
 install-data-local:
+       $(mkinstalldirs) $(DESTDIR)$(ginactutorialdir)
        @for p in $(PNG); do \
-          if [ -f $(srcdir)/$$p ]; then \
-           echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ginactutorialdir)/$$p"; \
-           $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ginactutorialdir)/$$p; \
+          if [ -f $$p ]; then \
+           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(ginactutorialdir)/$$p"; \
+           $(INSTALL_DATA) $$p $(DESTDIR)$(ginactutorialdir)/$$p; \
          fi; \
        done