Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 500614 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile.orig (-7 / +11 lines)
Lines 81-86 Link Here
81
include $(MODULE_TOPDIR)/include/Make/Docs.make
81
include $(MODULE_TOPDIR)/include/Make/Docs.make
82
include $(MODULE_TOPDIR)/include/Make/Doxygen.make
82
include $(MODULE_TOPDIR)/include/Make/Doxygen.make
83
83
84
DIST_INST_DIR:=		${INST_DIR}
85
INST_DIR:=		${DESTDIR}/${INST_DIR}
86
BINDIR:=		${DESTDIR}/${BINDIR}
87
84
default: builddemolocation
88
default: builddemolocation
85
	@echo "GRASS GIS compilation log"     > $(ERRORLOG)
89
	@echo "GRASS GIS compilation log"     > $(ERRORLOG)
86
	@echo "-------------------------"    >> $(ERRORLOG)
90
	@echo "-------------------------"    >> $(ERRORLOG)
Lines 272-278 Link Here
272
	test -d ${INST_DIR} || ${MAKE_DIR_CMD} ${INST_DIR}
276
	test -d ${INST_DIR} || ${MAKE_DIR_CMD} ${INST_DIR}
273
	@##### test -d ${INST_DIR}/dev || ${MAKE_DIR_CMD} ${INST_DIR}/dev
277
	@##### test -d ${INST_DIR}/dev || ${MAKE_DIR_CMD} ${INST_DIR}/dev
274
	test -d ${BINDIR} || ${MAKE_DIR_CMD} ${BINDIR}
278
	test -d ${BINDIR} || ${MAKE_DIR_CMD} ${BINDIR}
275
	-sed -e "s#GISBASE=.*#GISBASE=${INST_DIR}#" ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR} > ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
279
	-sed -e "s#GISBASE=.*#GISBASE=${DIST_INST_DIR}#" ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR} > ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
276
	-chmod a+x ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
280
	-chmod a+x ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
277
	-cd ${GISBASE} ; tar cBf - $(FILES) | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
281
	-cd ${GISBASE} ; tar cBf - $(FILES) | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
278
	-cd ${GISBASE} ; tar cBf - bin | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
282
	-cd ${GISBASE} ; tar cBf - bin | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
Lines 286-292 Link Here
286
endif
290
endif
287
	-cd ${GISBASE} ; tar cBf - scripts | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
291
	-cd ${GISBASE} ; tar cBf - scripts | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
288
	-cd ${GISBASE} ; tar cBf - tools | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
292
	-cd ${GISBASE} ; tar cBf - tools | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
289
	if [ ${LOCALE} -eq 1 ] ; then cd ${GISBASE} ; tar cBf - locale | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null ; fi
293
	if [ ${LOCALE} -eq 1 -a -f ${GISBASE}/locale ] ; then cd ${GISBASE} ; tar cBf - locale | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null ; fi
290
	@ # The man, include, and lib could go to ${PREFIX}/ BUT if this is
294
	@ # The man, include, and lib could go to ${PREFIX}/ BUT if this is
291
	@ # done, then the corresponding uninstall instructions must delete
295
	@ # done, then the corresponding uninstall instructions must delete
292
	@ # the grass files BY FILENAME NOT DIRECTORY!! Otherwise there is a
296
	@ # the grass files BY FILENAME NOT DIRECTORY!! Otherwise there is a
Lines 294-308 Link Here
294
	@ # default to be /usr/local
298
	@ # default to be /usr/local
295
	@##### -cd ${GISBASE} ; tar cBf - man | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
299
	@##### -cd ${GISBASE} ; tar cBf - man | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
296
	-cd ${GISBASE} ; tar cBf - include | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
300
	-cd ${GISBASE} ; tar cBf - include | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
297
	-sed -e "s#^\(GRASS_HOME.[^=]*\).*#\1= ${INST_DIR}#" \
301
	-sed -e "s#^\(GRASS_HOME.[^=]*\).*#\1= ${DIST_INST_DIR}#" \
298
		-e "s#^\(RUN_GISBASE.[^=]*\).*#\1= ${INST_DIR}#" \
302
		-e "s#^\(RUN_GISBASE.[^=]*\).*#\1= ${DIST_INST_DIR}#" \
299
		${GISBASE}/include/Make/Platform.make > ${INST_DIR}/include/Make/Platform.make
303
		${GISBASE}/include/Make/Platform.make > ${INST_DIR}/include/Make/Platform.make
300
	-sed -e "s#^\(ARCH_DISTDIR.[^=]*\).*#\1= ${INST_DIR}#" \
304
	-sed -e "s#^\(ARCH_DISTDIR.[^=]*\).*#\1= ${DIST_INST_DIR}#" \
301
		-e "s#^\(ARCH_BINDIR.[^=]*\).*#\1= ${UNIX_BIN}#" \
305
		-e "s#^\(ARCH_BINDIR.[^=]*\).*#\1= ${UNIX_BIN}#" \
302
		${GISBASE}/include/Make/Grass.make > ${INST_DIR}/include/Make/Grass.make
306
		${GISBASE}/include/Make/Grass.make > ${INST_DIR}/include/Make/Grass.make
303
	-cd ${GISBASE} ; tar cBf - lib | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
307
	-cd ${GISBASE} ; tar cBf - lib | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
304
	-sed 's#'${GISBASE}'#'${INST_DIR}'#g' ${GISBASE}/etc/monitorcap > ${INST_DIR}/etc/monitorcap
308
	-sed 's#'${GISBASE}'#'${DIST_INST_DIR}'#g' ${GISBASE}/etc/monitorcap > ${INST_DIR}/etc/monitorcap
305
	-sed 's#'${GISBASE}'#'${INST_DIR}'#g' ${GISBASE}/etc/fontcap > ${INST_DIR}/etc/fontcap
309
	-sed 's#'${GISBASE}'#'${DIST_INST_DIR}'#g' ${GISBASE}/etc/fontcap > ${INST_DIR}/etc/fontcap
306
	@##### -chmod -R 1777 ${INST_DIR}/locks 2>/dev/null
310
	@##### -chmod -R 1777 ${INST_DIR}/locks 2>/dev/null
307
	-chmod -R a+rX ${INST_DIR} 2>/dev/null
311
	-chmod -R a+rX ${INST_DIR} 2>/dev/null
308
ifeq ($(strip $(MINGW)),)
312
ifeq ($(strip $(MINGW)),)

Return to bug 500614