[GRASS-SVN] r32706 - grass/trunk

[svn_grass at osgeo.org]

Author: glynn
Date: 2008-08-12 00:25:52 -0400 (Tue, 12 Aug 2008)
New Revision: 32706

Modified:
   grass/trunk/Makefile
Log:
locale doesn't need special handling


Modified: grass/trunk/Makefile
===================================================================
--- grass/trunk/Makefile	2008-08-12 04:24:52 UTC (rev 32705)
+++ grass/trunk/Makefile	2008-08-12 04:25:52 UTC (rev 32706)
@@ -53,16 +53,11 @@
 	vector \
 	visualization \
 	man \
-	macosx
+	macosx \
+	locale
 
 SUBDIRS = $(DIRS)
 
-ifneq ($(strip $(HAVE_NLS)),)
-	LOCALE=1
-else
-	LOCALE=0
-endif
-
 FILES = AUTHORS COPYING CHANGES REQUIREMENTS.html GPL.TXT
 
 BIN_DIST_FILES = $(FILES) \
@@ -89,7 +84,6 @@
 	for subdir in $$list; do \
 		$(MAKE) -C $$subdir; \
 	done
-	if [ ${LOCALE} -eq 1 ] ; then $(MAKE) -C locale; fi
 	-cp -f $(FILES) ${ARCH_DISTDIR}/
 	-cp -f ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR} ${ARCH_DISTDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.tmp
 	@(cd tools ; sh -c "./build_html_index.sh")
@@ -265,7 +259,7 @@
 	-cd ${GISBASE} ; tar cBf - fonts | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
 	-cd ${GISBASE} ; tar cBf - man | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
 	-cd ${GISBASE} ; tar cBf - scripts | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
-	if [ ${LOCALE} -eq 1 ] ; then cd ${GISBASE} ; tar cBf - locale | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null ; fi
+	-cd ${GISBASE} ; tar cBf - locale | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
 	@ # The man, include, and lib could go to ${PREFIX}/ BUT if this is
 	@ # done, then the corresponding uninstall instructions must delete
 	@ # the grass files BY FILENAME NOT DIRECTORY!! Otherwise there is a