Applied patch file #10344.

[pspp] / src / libpspp / automake.mk

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index 1b5c352873616dd8e8b6535133d3a4265df33f9f..7abd32cc557a605b795b4896c9fe370a61b8ada1 100644 (file)
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -6,6 +6,7 @@ noinst_LIBRARIES += src/libpspp/libpspp.a
 src_libpspp_libpspp_a_SOURCES = \
        src/libpspp/array.c \
        src/libpspp/array.h \
+       src/libpspp/assertion.h \
        src/libpspp/alloc.c \
        src/libpspp/alloc.h \
        src/libpspp/bit-vector.h \
@@ -16,6 +17,12 @@ src_libpspp_libpspp_a_SOURCES = \
        src/libpspp/freaderror.h \
        src/libpspp/hash.c \
        src/libpspp/hash.h \
+       src/libpspp/i18n.c \
+       src/libpspp/i18n.h \
+       src/libpspp/ll.c \
+       src/libpspp/ll.h \
+       src/libpspp/llx.c \
+       src/libpspp/llx.h \
        src/libpspp/magic.c \
        src/libpspp/magic.h \
        src/libpspp/misc.c \
@@ -28,7 +35,6 @@ src_libpspp_libpspp_a_SOURCES = \
        src/libpspp/start-date.h \
        src/libpspp/str.c \
        src/libpspp/str.h \
-       src/libpspp/va_copy.h \
        src/libpspp/verbose-msg.c \
        src/libpspp/verbose-msg.h \
        src/libpspp/version.h 
@@ -40,7 +46,7 @@ src_libpspp_libpspp_a_CPPFLAGS = -I $(top_srcdir)/src/libpspp $(AM_CPPFLAGS)
 nodist_src_libpspp_libpspp_a_SOURCES = src/libpspp/version.c
 
 src/libpspp/version.c:
-       @mkdir -p src/libpspp
+       @$(top_srcdir)/mkinstalldirs  src/libpspp
        echo "#include <config.h>" > $@
        echo "#include \"version.h\"" > $@
        echo "const char bare_version[] = \"@VERSION@\";" >> $@
@@ -53,12 +59,6 @@ src/libpspp/version.c:
 \"~/.pspp:$(pkgsysconfdir)\";" >> $@
        echo "const char include_path[] =\
 \"./:~/.pspp/include:$(pkgdatadir)\";" >> $@
-       echo "const char groff_font_path[] = \"~/.pspp/font:\" \\" >> $@
-       echo "  \"$(pkgdatadir)/font:\" \\" >> $@
-       echo "  \"/usr/local/lib/groff/font:\" \\" >> $@
-       echo "  \"/usr/lib/groff/font:\" \\" >> $@
-       echo "  \"/usr/local/share/groff/font:\" \\" >> $@
-       echo "  \"/usr/share/groff/font\";" >> $@
        echo "const char locale_dir[] = \"$(datadir)/locale\";" >> $@