ソースを参照

MSys/MinGW fixes

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@37808 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 16 年 前
コミット
93ab103c89
2 ファイル変更3 行追加1 行削除
  1. 1 1
      Makefile
  2. 2 0
      tools/timer/Makefile

+ 1 - 1
Makefile

@@ -404,7 +404,7 @@ changelog:
 builddemolocation:
 	test -d ${ARCH_DISTDIR} || ${MAKE_DIR_CMD} ${ARCH_DISTDIR}
 	-tar cBf - demolocation | (cd ${ARCH_DISTDIR}/ ; tar xBfo - ) 2>/dev/null
-	sed 's!@GISDBASE@!$(ARCH_DISTDIR)!' < grassrc.tmpl > $(ARCH_DISTDIR)/demolocation/.grassrc$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
+	sed 's!@GISDBASE@!$(RUN_GISBASE)!' < grassrc.tmpl > $(ARCH_DISTDIR)/demolocation/.grassrc$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
 
 .PHONY: default libs cleandistdirs cleanscriptstrings clean libsclean
 .PHONY: distclean strip install real-install install-strip install-macosx

+ 2 - 0
tools/timer/Makefile

@@ -6,4 +6,6 @@ PGM = current_time_s_ms
 include $(MODULE_TOPDIR)/include/Make/Etc.make
 include $(MODULE_TOPDIR)/include/Make/NoHtml.make
 
+FMODE_OBJ =
+
 default: etc