浏览代码

locale doesn't need special handling

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@32706 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 17 年之前
父节点
当前提交
681aefc48e
共有 1 个文件被更改,包括 3 次插入9 次删除
  1. 3 9
      Makefile

+ 3 - 9
Makefile

@@ -53,16 +53,11 @@ DIRS = \
 	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 @@ default: builddemolocation
 	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 @@ endif
 	-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