projects / pspp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 41de588)
Make configure create doc/examples so the Makefiles don't need to.
authorBen Pfaff <blp@cs.stanford.edu>
Sun, 25 Oct 2020 03:26:13 +0000 (20:26 -0700)
committerBen Pfaff <blp@cs.stanford.edu>
Sun, 25 Oct 2020 03:26:13 +0000 (20:26 -0700)
configure.ac patch | blob | history
doc/automake.mk patch | blob | history

diff --git a/configure.ac b/configure.ac
index 551438ab49d9262b868578516c2dd4afe68815fc..096825a08b3608642f939c5354922e176bf4019f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -136,6 +136,7 @@ if test "$with_cairo" != no && test "$with_gui" != "no"; then
 
   PKG_CHECK_MODULES([SPREAD_SHEET_WIDGET], [spread-sheet-widget >= 0.7], [],
     [PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.7 (or use --without-gui)])])
+  PKG_CHECK_VAR([SPREAD_SHEET_WIDGET_LIBDIR], [spread-sheet-widget], [libdir])
 
   PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.44],
     [AC_DEFINE([HAVE_RSVG], 1, [Define to 1 if librsvg is available])],
@@ -315,7 +316,7 @@ LIBS="$LIBICONV $LIBS"
 
 dnl Required by the gnulib 'relocatable-prog' module.
 dnl See doc/relocatable-maint.texi in the gnulib tree for details.
-RELOCATABLE_LIBRARY_PATH='$(pkglibdir)'
+RELOCATABLE_LIBRARY_PATH='$(pkglibdir):$(SPREAD_SHEET_WIDGET_LIBDIR)'
 RELOCATABLE_STRIP=:
 
 PSPP_CHECK_PREREQS
@@ -323,7 +324,7 @@ PSPP_CHECK_PREREQS
 AC_CONFIG_FILES(
   [Makefile gl/Makefile po/Makefile tests/atlocal perl-module/lib/PSPP.pm])
 
-AC_CONFIG_COMMANDS([doc/dummy], [:])
+AC_CONFIG_COMMANDS([doc/examples/dummy], [:])
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
diff --git a/doc/automake.mk b/doc/automake.mk
index 6f9ad07232a8bce7360d9f85e6e4b49bb9b5a551..a928c621f353ec51190dc5adc6a9a7b300fb5724 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -70,11 +70,9 @@ EXTRA_DIST += doc/get-commands.pl \
               doc/prepdoc.sh
 
 $(srcdir)/doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
-       @$(MKDIR_P)  doc
        $(AM_V_GEN)$(PERL) $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@
 
 $(srcdir)/doc/tut.texi:
-       @$(MKDIR_P) doc
        $(AM_V_GEN)echo "@set example-dir $(examplesdir)" > $@
 
 
@@ -82,7 +80,6 @@ doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS) doc/help-pages-list
 if BROKEN_DOCBOOK_XML
        touch $@
 else
-       @$(MKDIR_P)  doc
        $(AM_V_GEN)$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
                $< -o $@
 endif
@@ -156,7 +153,6 @@ SUFFIXES: .sps
 
 # use pspp to process a syntax file and reap the output into a text file
 .sps.out:
-       $(MKDIR_P) $(@D)
        where=$$PWD ; \
        (cd $(top_srcdir)/examples; ${abs_builddir}/src/ui/terminal/pspp $(abs_srcdir)/doc/examples/$(<F) -o $$where/$@)
 
@@ -164,7 +160,6 @@ SUFFIXES: .sps
 # Then, use sed to delete everything up to and including <body> and
 # everything after and including </body>
 .sps.html:
-       $(MKDIR_P) $(@D)
        where=$$PWD ; \
        (cd $(top_srcdir)/examples; ${abs_builddir}/src/ui/terminal/pspp $(abs_srcdir)/doc/examples/$(<F) -o $$where/$@,x -O format=html)
        $(SED) -e '\%</body%,$$d' -e '0,/<body/d' $@,x > $@
Unnamed repository; edit this file to name it for gitweb.