Add:Core:Made new variable SOURCE_MODE to distinguish between tarball and svn, Automa...

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

diff --git a/configure.in b/configure.in
index 771a79e..9f3fbd5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,15 +1,25 @@
 AC_INIT(navit, 0.1.0)
+SOURCE_MODE=svn
+
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 
+AC_SUBST(SOURCE_MODE)
+AM_CONDITIONAL(SOURCE_MODE_SVN, [test "x${SOURCE_MODE}" = "xsvn"])
+
+if test "x${SOURCE_MODE}" = "xsvn" ; then
+       USE_MAINTAINER_MODE=yes
+else
+       USE_MAINTAINER_MODE=no
+fi
+
 AC_DEFUN([AM_MAINTAINER_MODE],
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is enabled by default (reason of inclusion of this function)
   AC_ARG_ENABLE(maintainer-mode,
 [  --enable-maintainer-mode  enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=yes)
+      USE_MAINTAINER_MODE=$enableval)
   AC_MSG_RESULT([$USE_MAINTAINER_MODE])
   AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
   MAINT=$MAINTAINER_MODE_TRUE

diff --git a/navit/Makefile.am b/navit/Makefile.am
index d7347dd..73d5ac8 100644 (file)
--- a/navit/Makefile.am
+++ b/navit/Makefile.am
@@ -60,7 +60,11 @@ endif
 
 version.h.tmp:
        echo "#include \"config.h\"" >version.h.tmp
+if SOURCE_MODE_SVN
        echo "#define SVN_VERSION \"$$(LANG=C svnversion 2>/dev/null)\"" >>version.h.tmp
+else
+       echo "#define SVN_VERSION \"@SOURCE_MODE@\"" >>version.h.tmp
+endif
        if ! diff version.h.tmp version.h >/dev/null 2>/dev/null; \
        then \
                mv version.h.tmp version.h; \

diff --git a/po/Makefile.am b/po/Makefile.am
index ce6a1f1..e7cd609 100644 (file)
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -28,7 +28,7 @@ SUFFIXES = .po .mo
 all: @MOFILES@
 
 @POFILES@: navit.pot
-       $(MSGMERGE) --no-fuzzy-matching --verbose -o $(top_builddir)/po/$@ $(top_srcdir)/po/$@.in navit.pot
+       sed 's/^"Project-Id-Version:.*/"Project-Id-Version: $(PACKAGE_STRING)\\n"/' < $(top_srcdir)/po/$@.in | $(MSGMERGE) --no-fuzzy-matching --verbose -o $(top_builddir)/po/$@ - navit.pot
 
 navit.pot: $(POTFILES)
         $(XGETTEXT) --default-domain=navit \