Build demolocation using $(MKDIR) and $(INSTALL) instead of "tar"

Remove "builddemolocation" target; just make demolocation directory


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@39708 15284696-431f-4ddb-bdfa-cd5b030d7da7

Makefile

@@ -34,6 +34,7 @@ GRASS_PDFDIR=		$(DOCSDIR)/pdf
 
 
 DIRS = \
+	demolocation \
 	tools \
 	lib \
 	db \
@@ -74,7 +75,7 @@ BIN_DIST_FILES = $(FILES) \
 	man \
 	scripts
 
-default: builddemolocation
+default:
 	@echo "GRASS GIS compilation log"     > $(ERRORLOG)
 	@echo "-------------------------"    >> $(ERRORLOG)
 	@echo "Started compilation: `date`"  >> $(ERRORLOG)
@@ -83,7 +84,7 @@ default: builddemolocation
 	chmod 755 install-sh
 	@list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
-		$(MAKE) -C $$subdir; \
+		$(MAKE) -C $$subdir || echo $(CURDIR)/$$subdir >> $(ERRORLOG) ; \
 	done
 	$(MAKE) $(FILES_DST)
 	$(MAKE) ${ARCH_DISTDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.tmp
@@ -402,14 +403,8 @@ changelog:
 	fi
 	sh svn2cl ./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@!$(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
 .PHONY: bindist real-bindist bindist-macosx srcdist srclibsdist
 .PHONY: htmldocs-single htmldocs packagehtmldocs pdfdocs cleandocs html2pdfdoc
-.PHONY: html2pdfdoccomplete changelog builddemolocation
+.PHONY: html2pdfdoccomplete changelog

demolocation/Makefile

@@ -0,0 +1,28 @@
+MODULE_TOPDIR = ..
+
+include $(MODULE_TOPDIR)/include/Make/Other.make
+
+SRCFILES = WIND DEFAULT_WIND VAR PROJ_INFO PROJ_UNITS MYNAME
+MAPS = mysites point
+MAPFILES = dbln coor topo head cidx hist
+DBFFILES := $(foreach map,$(MAPS),dbf/$(map).dbf)
+VECTFILES := $(foreach map,$(MAPS),$(foreach file,$(MAPFILES),vector/$(map)/$(file)))
+SRC := $(SRCFILES) $(DBFFILES) $(VECTFILES)
+DIRS := PERMANENT PERMANENT/vector PERMANENT/dbf $(patsubst %,PERMANENT/vector/%,$(MAPS))
+
+DSTDIR = $(ARCH_DISTDIR)/demolocation
+DST := $(patsubst %,$(DSTDIR)/PERMANENT/%,$(SRC))
+DSTDIRS := $(patsubst %,$(DSTDIR)/%,$(DIRS))
+
+RCFILE = $(DSTDIR)/.grassrc$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
+
+default: $(DST) $(RCFILE)
+
+$(DSTDIR)/PERMANENT/%: PERMANENT/% | $(DSTDIRS)
+	$(INSTALL_DATA) $< $@
+
+$(DSTDIRS): %:
+	$(MKDIR) $@
+
+$(RCFILE): grassrc.tmpl | $(DSTDIRS)
+	sed 's!@GISDBASE@!$(RUN_GISBASE)!' < $< > $@

include/Make/Rules.make

@@ -8,7 +8,7 @@ ARCH_DIRS = $(ARCH_DISTDIR) $(ARCH_BINDIR) $(ARCH_INCDIR) $(ARCH_LIBDIR) \
 	$(DRIVERDIR) $(DBDRIVERDIR) $(FONTDIR) $(DOCSDIR) $(HTMLDIR) \
 	$(MANBASEDIR) $(MANDIR) $(TOOLSDIR)
 
-pre: $(ARCH_DIRS)
+pre: | $(ARCH_DIRS)
 
 default: