From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 29 Jan 2009 22:37:37 +0000 (+0900)
Subject: Merge branch 'savannah/perl-module'
X-Git-Tag: v0.7.1~1
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d75247c28e0dce9c21070e4ee14fdc6a2338fb77;p=pspp-builds.git

Merge branch 'savannah/perl-module'

Conflicts:

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

d75247c28e0dce9c21070e4ee14fdc6a2338fb77
diff --cc src/libpspp/automake.mk
index 292068ec,9eed0027..dc512bb2
--- a/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@\";" >> $@