Fix:Mg:Applied patch from ticket #526, broken M&G street search

[navit-package] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a8ea10b..29d6172 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,18 @@
+ACLOCAL_AMFLAGS= -I m4
 include $(top_srcdir)/Makefile.inc
-SUBDIRS=src po intl
+SUBDIRS=
+if ENABLE_NLS
+XCFLAGS=-DINSTALLPREFIX=INSTALLDIR
+if SUPPORT_WIN32
+XCFLAGS+=-DSUBLANG_BENGALI_BANGLADESH=0x03 -DSUBLANG_PUNJABI_PAKISTAN=0x03 -DSUBLANG_ROMANIAN_MOLDOVA=0x03
+endif
+if SUPPORT_ANDROID
+XCFLAGS+=-Xcompiler -nostartfiles
+endif
+export XCFLAGS
+SUBDIRS+=intl po
+endif
+SUBDIRS+=navit
 pkgdoc_DATA = README
-EXTRA_DIST = README
-
-all-local:
-       @echo ------------------------
-       @echo Navit build complete
-       @echo To build the sample map:
-       @echo make samplemap
-       @echo To install the sample map:
-       @echo make installsamplemap
-       @echo ------------------------
-
-samplemap:
-       make -C src samplemap
-
-installsamplemap:
-       make -C src installsamplemap
-
+EXTRA_DIST = README COPYRIGHT LGPL-2 GPL-2 COPYING INSTALL
+DIST_SUBDIRS=intl po navit