Core:Fix:Improve make dist with patch from Roy Rankin

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@1859 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/Makefile.am b/Makefile.am
index a7afcec..91b4661 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,5 +5,5 @@ SUBDIRS+=intl po
 endif
 SUBDIRS+=navit
 pkgdoc_DATA = README
-EXTRA_DIST = README COPYRIGHT
+EXTRA_DIST = README COPYRIGHT LGPL-2 GPL-2 COPYING INSTALL
 DIST_SUBDIRS=intl po navit

diff --git a/configure.in b/configure.in
index d6b96c5..90b933b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -584,6 +584,7 @@ AC_ARG_ENABLE(nls,
 INTLIBS=""
 MOFILES=""
 POFILES=""
+POIFILES=""
 LINGUAS=""
 
 if test "x$enable_nls" = "xyes"; then
@@ -626,10 +627,14 @@ if test "x$enable_nls" = "xyes"; then
  for lang in $LINGUAS; do
     POFILES="$POFILES $lang.po"
  done
+ for lang in $LINGUAS; do
+    POIFILES="$POIFILES $lang.po.in"
+ done
 
 AC_SUBST(INTLIBS)
 AC_SUBST(MOFILES)
 AC_SUBST(POFILES)
+AC_SUBST(POIFILES)
 AM_GNU_GETTEXT_VERSION
 AM_GNU_GETTEXT(no-libtool, need-ngettext, \$(top_builddir)/intl/)
 AC_SUBST(LIBINTL)

diff --git a/po/Makefile.am b/po/Makefile.am
index e7cd609..ca61990 100644 (file)
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -3,7 +3,7 @@ CATALOGS = @MOFILES@
 CLEANFILES = $(CATALOGS) navit.pot
 
 # keep this sorted
-EXTRA_DIST = @POFILES@
+EXTRA_DIST = @POIFILES@
 
 POTFILES  = \
        $(top_srcdir)/navit/main.c \