magic-elimination.patch from patch #6230.

[pspp-builds.git] / src / libpspp / automake.mk

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index ca6b7195b160243265e93302ee26b884ac584d08..1c56ca6164fc98c1a6cd9b5f88c379c20dc520f1 100644 (file)
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -39,8 +39,6 @@ src_libpspp_libpspp_a_SOURCES = \
        src/libpspp/ll.h \
        src/libpspp/llx.c \
        src/libpspp/llx.h \
-       src/libpspp/magic.c \
-       src/libpspp/magic.h \
        src/libpspp/message.c \
        src/libpspp/message.h \
        src/libpspp/misc.c \
@@ -89,9 +87,9 @@ src/libpspp/version.c: $(top_srcdir)/AUTHORS
        echo "const char host_system[] = \"$(host_triplet)\";" >> $@
        echo "const char build_system[] = \"$(build_triplet)\";" >> $@
        echo "const char default_config_path[] =\
-\"~/.pspp:$(pkgsysconfdir)\";" >> $@
+\"\$$HOME/.pspp:$(pkgsysconfdir)\";" >> $@
        echo "const char include_path[] =\
-\"./:~/.pspp/include:$(pkgdatadir)\";" >> $@
+\"./:\$$HOME/.pspp/include:$(pkgdatadir)\";" >> $@
        echo "const char locale_dir[] = \"$(datadir)/locale\";" >> $@
        echo "const char *const authors[] = {" >> $@
        sed -e 's/^/  \"/' -e 's/$$/\",/' $(top_srcdir)/AUTHORS >> $@