Merge branch 'savannah/perl-module'

Conflicts:

	po/en_GB.po
	src/libpspp/automake.mk

diff --cc po/en_GB.po
Simple merge

diff --cc src/libpspp/automake.mk
index 292068ec7dbad12612104bf1fae106b2bebcbfd4,9eed00276db9f03eb33ea74058db61cad1b8a0d3..dc512bb288907f59cc668e1ea989e8c7858f6916
--- 1/src/libpspp/automake.mk
--- 2/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@@ -75,10 -75,14 +75,14 @@@ src_libpspp_libpspp_la_CPPFLAGS = -I $(
  
  nodist_src_libpspp_libpspp_la_SOURCES = src/libpspp/version.c
  
 -src/libpspp/version.c: $(top_srcdir)/AUTHORS $(top_builddir)/Makefile
 +src/libpspp/version.c: $(top_srcdir)/AUTHORS Makefile
        @$(MKDIR_P) src/libpspp
        echo "/*        -*- mode: c; buffer-read-only: t -*-" > $@
-       echo "   Generated by src/libpspp/automake.mk --- Do not edit. */">> $@
+       echo "   Generated by src/libpspp/automake.mk --- Do not edit.">> $@
+       echo "" >> $@
+       echo "   The following line is for the benefit of the perl module" >>$@
+       echo "\$$VERSION='"@VERSION@"';" >> $@
+       echo "*/" >> $@
        echo "#include \"version.h\"" >> $@
        echo "const char bare_version[] = \"@VERSION@\";" >> $@
        echo "const char version[] = \"GNU @PACKAGE@ @VERSION@\";" >> $@