File routino-2.6-makefiles.patch of Package routino

diff -ur routino-2.6/doc/Makefile routino-2.6-makefiles/doc/Makefile
--- routino-2.6/doc/Makefile	2013-07-06 11:42:58.000000000 +0200
+++ routino-2.6-makefiles/doc/Makefile	2013-07-21 02:59:59.000000000 +0200
@@ -28,18 +28,18 @@
 
 # Files to install
 
-HTML_FILES=$(notdir $(wildcard html/*.html)) $(notdir $(wildcard html/*.css))
+HTML_FILES=html/*.html html/*.css html/*.png
 TXT_FILES=*.txt
-TOP_FILES=../agpl-3.0.txt
+TOP_FILES=../agpl-3.0.txt ../ChangeLog
 
 ########
 
 all:
 	-@[ -d $(WEBDOCDIR) ] && \
 	  for file in $(HTML_FILES); do \
-	     if [ ! -f $(WEBDOCDIR)/$$file ] || [ html/$$file -nt $(WEBDOCDIR)/$$file ]; then \
-	        echo cp html/$$file $(WEBDOCDIR) ;\
-	        cp -f html/$$file $(WEBDOCDIR) ;\
+	     if [ ! -f $(WEBDOCDIR)/$$file ] || [ $$file -nt $(WEBDOCDIR)/$$file ]; then \
+	        echo cp -pf $$file $(WEBDOCDIR) ;\
+	        cp -pf $$file $(WEBDOCDIR) ;\
 	     fi ;\
 	  done
 
@@ -53,19 +53,19 @@
 	-[ -d $(DESTDIR)$(docdir) ] || mkdir -p $(DESTDIR)$(docdir)
 	@[ -d $(DESTDIR)$(docdir) ] && \
 	  for file in $(TOP_FILES); do \
-	     echo cp $$file $(DESTDIR)$(docdir) ;\
-	     cp -f $$file $(DESTDIR)$(docdir) ;\
+	     echo cp -pf $$file $(DESTDIR)$(docdir) ;\
+	     cp -pf $$file $(DESTDIR)$(docdir) ;\
 	  done
 	@[ -d $(DESTDIR)$(docdir) ] && \
 	  for file in $(TXT_FILES); do \
-	     echo cp $$file $(DESTDIR)$(docdir) ;\
-	     cp -f $$file $(DESTDIR)$(docdir) ;\
+	     echo cp -pf $$file $(DESTDIR)$(docdir) ;\
+	     cp -pf $$file $(DESTDIR)$(docdir) ;\
 	  done
 	-[ -d $(DESTDIR)$(docdir)/html ] || mkdir -p $(DESTDIR)$(docdir)/html
 	@[ -d $(DESTDIR)$(docdir)/html ] && \
 	  for file in $(HTML_FILES); do \
-	     echo cp $$file $(DESTDIR)$(docdir)/html ;\
-	     cp -f $$file $(DESTDIR)$(docdir)/html ;\
+	     echo cp -pf $$file $(DESTDIR)$(docdir)/html ;\
+	     cp -pf $$file $(DESTDIR)$(docdir)/html ;\
 	  done
 
 ########
diff -ur routino-2.6/Makefile.conf routino-2.6-makefiles/Makefile.conf
--- routino-2.6/Makefile.conf	2013-07-01 20:17:02.000000000 +0200
+++ routino-2.6-makefiles/Makefile.conf	2013-07-21 02:01:21.000000000 +0200
@@ -20,9 +20,9 @@
 
 # Installation locations (edit if required)
 
-prefix=/usr/local
+prefix=/usr
 bindir=$(prefix)/bin
-docdir=$(prefix)/doc/routino
+docdir=$(prefix)/share/doc/routino
 datadir=$(prefix)/share/routino
 
 
@@ -41,13 +41,12 @@
 
 
 # Language dialect selection
-CFLAGS=-std=c99
+CFLAGS+=-std=c99
 
 # Warning options
 CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter
 
 # Optimisation options
-CFLAGS+=-O3
 CFLAGS+=-ffast-math
 
 # Optimisation option (only works if compilation and execution use exactly the same CPU architecture).
@@ -55,7 +54,7 @@
 
 
 # Maths library
-LDFLAGS=-lm
+LDFLAGS+=-lm
 
 
 # Required for multi-threaded support (comment these two lines out if not required)
diff -ur routino-2.6/src/Makefile routino-2.6-makefiles/src/Makefile
--- routino-2.6/src/Makefile	2013-07-06 11:50:48.000000000 +0200
+++ routino-2.6-makefiles/src/Makefile	2013-07-21 02:42:29.000000000 +0200
@@ -58,8 +58,8 @@
 	-@[ -d $(WEBBINDIR) ] && \
 	  for file in $(EXE); do \
 	     if [ ! -f $(WEBBINDIR)/$$file ] || [ $$file -nt $(WEBBINDIR)/$$file ]; then \
-	        echo cp $$file $(WEBBINDIR) ;\
-	        cp -f $$file $(WEBBINDIR) ;\
+	        echo install -p $$file $(WEBBINDIR) ;\
+	        install -p $$file $(WEBBINDIR) ;\
 	     fi ;\
 	  done
 
@@ -73,7 +73,7 @@
 	           xmlparse.o tagging.o \
 	           uncompress.o osmxmlparse.o osmpbfparse.o osmo5mparse.o osmparser.o
 
-planetsplitter : $(PLANETSPLITTER_OBJ)
+planetsplitter : $(PLANETSPLITTER_OBJ) .deps
 	$(LD) $(PLANETSPLITTER_OBJ) -o $@ $(LDFLAGS)
 
 ########
@@ -141,12 +141,10 @@
 
 ########
 
-%.o : %.c
-	@[ -d .deps ] || mkdir .deps
+%.o : %.c .deps
 	$(CC) -c $(CFLAGS) -DSLIM=0 -DDATADIR=\"$(datadir)\" $< -o $@ -MMD -MP -MF $(addprefix .deps/,$(addsuffix .d,$(basename $@)))
 
-%-slim.o : %.c
-	@[ -d .deps ] || mkdir .deps
+%-slim.o : %.c .deps
 	$(CC) -c $(CFLAGS) -DSLIM=1 -DDATADIR=\"$(datadir)\" $< -o $@ -MMD -MP -MF $(addprefix .deps/,$(addsuffix .d,$(basename $@)))
 
 ########
@@ -167,8 +165,8 @@
 	-[ -d $(DESTDIR)$(bindir) ] || mkdir -p $(DESTDIR)$(bindir)
 	@[ -d $(DESTDIR)$(bindir) ] && \
 	  for file in $(EXE); do \
-	     echo cp $$file $(DESTDIR)$(bindir) ;\
-	     cp -f $$file $(DESTDIR)$(bindir) ;\
+	     echo install -p $$file $(DESTDIR)$(bindir)/routino-$$file ;\
+	     install -p $$file $(DESTDIR)$(bindir)/routino-$$file ;\
 	  done
 
 ########
@@ -199,6 +197,9 @@
 
 ########
 
+.deps:
+	@[ -d .deps ] || mkdir $@
+
 include $(D)
 
 ########
diff -ur routino-2.6/xml/Makefile routino-2.6-makefiles/xml/Makefile
--- routino-2.6/xml/Makefile	2013-07-06 11:45:14.000000000 +0200
+++ routino-2.6-makefiles/xml/Makefile	2013-07-21 01:54:47.000000000 +0200
@@ -43,19 +43,22 @@
 ########
 
 all: $(SPECIAL_FILES)
-	-@for file in $(STANDARD_FILES); do \
+	-@[ -d $(WEBDATADIR) ] && \
+          for file in $(STANDARD_FILES); do \
 	     if [ ! -f $(WEBDATADIR)/$$file ] || [ routino-$$file -nt $(WEBDATADIR)/$$file ]; then \
-	        echo cp routino-$$file $(WEBDATADIR)/$$file ;\
-	        cp -f routino-$$file $(WEBDATADIR)/$$file ;\
+	        echo cp -pf routino-$$file $(WEBDATADIR)/$$file ;\
+	        cp -pf routino-$$file $(WEBDATADIR)/$$file ;\
 	     fi ;\
 	  done
-	-@for file in $(SPECIAL_FILES); do \
+	-@[ -d $(WEBDATADIR) ] && \
+	  for file in $(SPECIAL_FILES); do \
 	     if [ ! -f $(WEBDATADIR)/$$file ] || [ $$file -nt $(WEBDATADIR)/$$file ]; then \
-	        echo cp $$file $(WEBDATADIR)/$$file ;\
-	        cp -f $$file $(WEBDATADIR)/$$file ;\
+	        echo cp -pf $$file $(WEBDATADIR)/$$file ;\
+	        cp -pf $$file $(WEBDATADIR)/$$file ;\
 	     fi ;\
 	  done
-	-@if [ ! -f $(WEBWWWDIR)/profiles.js ] || [ ! -f $(WEBWWWDIR)/profiles.pl ] || \
+	-@[ -d $(WEBWWWDIR) ] && \
+	  if [ ! -f $(WEBWWWDIR)/profiles.js ] || [ ! -f $(WEBWWWDIR)/profiles.pl ] || \
 	     [ $(WEBDATADIR)/profiles.xml -nt $(WEBWWWDIR)/profiles.pl ] || \
 	     [ $(WEBDATADIR)/profiles.xml -nt $(WEBWWWDIR)/profiles.js ]; then \
 	     echo perl update-profiles.pl ;\
@@ -82,12 +85,12 @@
 install: all
 	-[ -d $(DESTDIR)$(datadir) ] || mkdir -p $(DESTDIR)$(datadir)
 	-@for file in $(STANDARD_FILES) ; do \
-	     echo cp routino-$$file $(DESTDIR)$(datadir)/$$file ;\
-	     cp -f routino-$$file $(DESTDIR)$(datadir)/$$file ;\
+	     echo cp -pf routino-$$file $(DESTDIR)$(datadir)/$$file ;\
+	     cp -pf routino-$$file $(DESTDIR)$(datadir)/$$file ;\
 	  done
 	-@for file in $(SPECIAL_FILES); do \
-	     echo cp $$file $(DESTDIR)$(datadir)/$$file ;\
-	     cp -f $$file $(DESTDIR)$(datadir)/$$file ;\
+	     echo cp -pf $$file $(DESTDIR)$(datadir)/$$file ;\
+	     cp -pf $$file $(DESTDIR)$(datadir)/$$file ;\
 	  done
 
 ########