1 --- grass-6.4.2/lib/gis/Makefile.orig 2011-03-10 10:54:19.000000000 +0100
2 +++ grass-6.4.2/lib/gis/Makefile 2012-10-20 14:32:27.320283161 +0200
5 LIB_OBJS := $(subst .c,.o,$(wildcard *.c))
6 LIB_OBJS := $(filter-out fmode.o dllmain.o,$(LIB_OBJS))
9 LIB_OBJS := $(LIB_OBJS) dllmain.o fmode.o
14 ifneq ($(GDAL_DYNAMIC),)
15 EXTRA_CFLAGS += -DGDAL_DYNAMIC=1
18 EXTRA_LIBS += -lkernel32
20 EXTRA_LIBS += $(DLLIB)
21 --- grass-6.4.2/lib/init/Makefile.orig 2011-06-08 12:30:46.000000000 +0200
22 +++ grass-6.4.2/lib/init/Makefile 2012-10-20 14:33:08.316948107 +0200
24 $(ETC)/html_browser_mac.sh
27 -ifneq ($(strip $(MINGW)),)
28 +ifeq ($(strip $(MINGW)),yes)
31 $(ETC)/winlocale$(EXE) \
32 --- grass-6.4.2/Makefile.orig 2011-05-13 21:01:14.000000000 +0200
33 +++ grass-6.4.2/Makefile 2012-10-20 14:34:32.893611225 +0200
38 -ifeq ($(strip $(MINGW)),)
39 +ifneq ($(strip $(MINGW)),yes)
44 @if [ `cat "$(ERRORLOG)" | wc -l` -gt 8 ] ; then false ; else true ; fi
47 -ifneq ($(strip $(MINGW)),)
48 +ifeq ($(strip $(MINGW)),yes)
49 find $(ARCH_DISTDIR) -type f -name '*.exe' | \
50 while read file ; do \
51 cmd=`basename "$$file" .exe` ; \
53 -cd ${GISBASE} ; tar cBf - driver | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
54 -cd ${GISBASE} ; tar cBf - etc | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
55 -cd ${GISBASE} ; tar cBf - fonts | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
56 -ifeq ($(strip $(MINGW)),)
57 +ifneq ($(strip $(MINGW)),yes)
58 -cd ${GISBASE} ; tar cBf - man | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
60 -cd ${GISBASE} ; tar cBf - scripts | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
62 -sed 's#'${GISBASE}'#'${INST_DIR}'#g' ${GISBASE}/etc/fontcap > ${INST_DIR}/etc/fontcap
63 @##### -chmod -R 1777 ${INST_DIR}/locks 2>/dev/null
64 -chmod -R a+rX ${INST_DIR} 2>/dev/null
65 -ifeq ($(strip $(MINGW)),)
66 +ifneq ($(strip $(MINGW)),yes)
68 -tar cBf - gem/skeleton | (cd ${INST_DIR}/etc ; tar xBf - ) 2>/dev/null
69 -${INSTALL} gem/gem$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR) ${BINDIR} 2>/dev/null
70 --- grass-6.4.2/lib/python/ctypes/Makefile.orig 2011-05-03 21:27:16.000000000 +0200
71 +++ grass-6.4.2/lib/python/ctypes/Makefile 2012-10-20 14:35:23.370275773 +0200
73 CTYPESFLAGS = --cpp "$(CC) -E $(CPPFLAGS) $(LFS_CFLAGS) $(EXTRA_CFLAGS) $(NLS_CFLAGS) $(DEFS) $(EXTRA_INC) $(INC)"
74 EXTRA_CLEAN_FILES := $(foreach M,$(MODULES),$(M).py) $(wildcard ctypesgencore/*.pyc) $(wildcard ctypesgencore/*/*.pyc)
81 --- grass-6.4.2/visualization/nviz/Makefile.orig 2008-12-23 15:05:57.000000000 +0100
82 +++ grass-6.4.2/visualization/nviz/Makefile 2012-10-20 14:36:21.746939990 +0200
85 INSTALL_DIR=$(GISBASE)/etc/$(NV_VER)
87 -ifneq ($(strip $(MINGW)),)
88 +ifeq ($(strip $(MINGW)),yes)
93 -$(MKDIR) $(INSTALL_DIR)
94 $(INSTALL) src/nvwish$(EXE) $(INSTALL_DIR)/$(PROG)$(EXE)
95 $(INSTALL) scripts/$(PROG) $(GISBASE)/bin
96 -ifneq ($(strip $(MINGW)),)
97 +ifeq ($(strip $(MINGW)),yes)
98 $(INSTALL) scripts/nviz.bat $(GISBASE)/bin
100 -$(MKDIR) $(INSTALL_DIR)/scripts
101 --- grass-6.4.2/visualization/nviz/html/Makefile.orig 2008-12-23 15:05:57.000000000 +0100
102 +++ grass-6.4.2/visualization/nviz/html/Makefile 2012-10-20 14:36:43.426939080 +0200
105 GRASS_NVIZ_DOCS=$(GISBASE)/docs/html/nviz
107 -ifneq ($(strip $(MINGW)),)
108 +ifeq ($(strip $(MINGW)),yes)
112 --- grass-6.4.2/gui/tcltk/Makefile.orig 2009-05-11 21:22:34.000000000 +0200
113 +++ grass-6.4.2/gui/tcltk/Makefile 2012-10-20 14:39:10.970266222 +0200
119 +ifneq ($(MINGW),yes)
123 --- grass-6.4.2/gui/scripts/Makefile.orig 2010-01-15 15:41:17.000000000 +0100
124 +++ grass-6.4.2/gui/scripts/Makefile 2012-10-20 14:39:41.100264957 +0200
127 include $(MODULE_TOPDIR)/include/Make/Dir.make
131 SCRIPT_ACTIONS += create.bat
134 --- grass-6.4.2/raster/Makefile.orig 2011-04-22 16:09:26.000000000 +0200
135 +++ grass-6.4.2/raster/Makefile 2012-10-20 14:40:31.790262831 +0200
138 include $(MODULE_TOPDIR)/include/Make/Platform.make
141 +ifneq ($(MINGW),yes)
145 --- grass-6.4.2/vector/v.transform/Makefile.orig 2008-12-19 21:28:57.000000000 +0100
146 +++ grass-6.4.2/vector/v.transform/Makefile 2012-10-20 14:40:59.673594995 +0200
149 include $(MODULE_TOPDIR)/include/Make/Module.make
155 EXTRA_LIB=$(VASKLIB) $(CURSES)
156 --- grass-6.4.2/include/Make/Grass.make.in.orig 2011-04-18 20:13:38.000000000 +0200
157 +++ grass-6.4.2/include/Make/Grass.make.in 2012-10-20 14:58:30.123550911 +0200
159 VECT_CFLAGS = $(GDALCFLAGS) $(GEOSCFLAGS)
161 # Object with _fmode which must be linked to each executable on Windows
164 FMODE_OBJ = $(MODULE_TOPDIR)/lib/gis/$(OBJDIR)/fmode.o
167 --- grass-6.4.2/include/Make/Shlib.make.orig 2012-10-20 14:41:45.603593065 +0200
168 +++ grass-6.4.2/include/Make/Shlib.make 2012-10-20 14:59:13.833549075 +0200
170 SHLIB = $(ARCH_LIBDIR)/$(SHLIB_PREFIX)$(SHLIB_NAME)$(SHLIB_SUFFIX)
172 # Object that calls _setfmode(_O_BINARY) which must be linked to each DLL on Windows
175 ifneq ($(SHLIB_NAME),$(DATETIME_LIBNAME))
176 ifneq ($(SHLIB_NAME),$(GIS_LIBNAME))
177 DLLMAIN_OBJ = $(MODULE_TOPDIR)/lib/gis/$(OBJDIR)/dllmain.o
180 $(SHLIB): $(SHLIB_OBJS)
181 $(SHLIB_LD) -o $@ -Wl,-soname,$(notdir $@) $(LDFLAGS) $^ $(EXTRA_LIBS) $(DLLMAIN_OBJ)
183 +ifneq ($(MINGW),yes)
184 (cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
187 --- grass-6.4.2/include/Make/Script.make.orig 2009-07-05 14:48:37.000000000 +0200
188 +++ grass-6.4.2/include/Make/Script.make 2012-10-20 14:59:58.503547201 +0200
190 include $(MODULE_TOPDIR)/include/Make/Rules.make
192 SCRIPT_ACTIONS = $(SCRIPT)
195 SCRIPT_ACTIONS += $(BIN)/$(PGM).bat
198 --- grass-6.4.3/include/Make/Rules.make.orig 2013-03-02 11:52:07.000000000 +0100
199 +++ grass-6.4.3/include/Make/Rules.make 2014-06-11 21:22:16.080021691 +0200
202 $(YACC) -b$* -p$* $(YACCFLAGS) $<
206 mkpath = $(shell $(TOOLSDIR)/g.echo$(EXE) $(1));$(2)
209 --- grass-6.4.2/general/g.version/Makefile.orig 2011-04-18 20:13:39.000000000 +0200
210 +++ grass-6.4.2/general/g.version/Makefile 2012-10-21 08:48:28.460856763 +0200
212 sed -e 's/^\(.*\)$$/"\1\\n"/' $< > $@
214 $(OBJDIR)/confparms.h: $(MODULE_TOPDIR)/config.status
215 - sed -n '7s/^#\(.*\)$$/"\1"/p' $< > $@
216 + sed -n '7s/^#\(.*\)$$/"\1"/p;s/^ac_cs_config="\(.*"\)$$/".\/configure \1/p' $< > $@