[GRASS-SVN] r46241 - grass/branches/develbranch_6

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2011-05-11 20:12:23 -0700 (Wed, 11 May 2011)
New Revision: 46241

Modified:
   grass/branches/develbranch_6/Makefile
Log:
fix install of g.html2man, restore some reversion from r45040

Modified: grass/branches/develbranch_6/Makefile
===================================================================
--- grass/branches/develbranch_6/Makefile	2011-05-12 03:08:14 UTC (rev 46240)
+++ grass/branches/develbranch_6/Makefile	2011-05-12 03:12:23 UTC (rev 46241)
@@ -46,12 +46,9 @@
 	tools \
 	vector \
 	visualization \
-	man
+	man \
+	macosx
 
-ifneq ($(strip $(MACOSX_APP)),)
-	SUBDIRS += macosx
-endif
-
 ifeq ($(strip $(MINGW)),)
 	SUBDIRS += gem
 endif
@@ -99,8 +96,9 @@
 	-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
 	@test -d ${ARCH_DISTDIR}/tools/ || mkdir -p ${ARCH_DISTDIR}/tools/
-	-${INSTALL} tools/g.html2man/g.html2man ${ARCH_DISTDIR}/tools/ 2>/dev/null
 	-${INSTALL} tools/mkhtml.sh ${ARCH_DISTDIR}/tools/ 2>/dev/null
+	@test -d ${ARCH_DISTDIR}/tools/g.html2man/ || mkdir -p ${ARCH_DISTDIR}/tools/g.html2man/
+	-${INSTALL} tools/g.html2man/g.html2man ${ARCH_DISTDIR}/tools/g.html2man/ 2>/dev/null
 	@(cd tools ; sh -c "./build_html_index.sh")
 	@if [ `cat "$(ERRORLOG)" | wc -l` -gt 5 ] ; then \
 		echo "--"     >> $(ERRORLOG) ; \