[osm-tile-server] 97/117: Move files to where they should be

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 0a2c44c9999400e87e9ff032d2103f1d552d60ba
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Fri Oct 30 18:40:54 2015 +0100

    Move files to where they should be
---
 scripts/Makefile                | 4 ++--
 scripts/osm-tile-server-process | 3 ++-
 src/Makefile                    | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/Makefile b/scripts/Makefile
index 6b48a87..57b83f3 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -3,9 +3,9 @@ default:
 install:
 	mkdir -p ${DESTDIR}/usr/bin
 	install osm-tile-server-process ${DESTDIR}/usr/bin/
-	install osm-tile-server-status ${DESTDIR}/usr/bin/
-	install osm-tile-server-download ${DESTDIR}/usr/bin/
 	install osm-tile-server-import ${DESTDIR}/usr/bin/
 	mkdir -p ${DESTDIR}/usr/lib/osm-tile-server-base/bin
+	install osm-tile-server-status  ${DESTDIR}/usr/lib/osm-tile-server-base/bin/
+	install osm-tile-server-download ${DESTDIR}/usr/lib/osm-tile-server-base/bin/
 	install install-postgis-osm-db.sh ${DESTDIR}/usr/lib/osm-tile-server-base/bin/
 	install install-postgis-osm-user.sh ${DESTDIR}/usr/lib/osm-tile-server-base/bin/
diff --git a/scripts/osm-tile-server-process b/scripts/osm-tile-server-process
index 87451cf..ae2441e 100755
--- a/scripts/osm-tile-server-process
+++ b/scripts/osm-tile-server-process
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 umask 002
+PATH=$PATH:/usr/lib/osm-tile-server-base/bin
 
 failed(){
     echo "Failed"
@@ -18,7 +19,7 @@ RET=$?
 set -e
 if [ "$RET" = "0" ] ; then
     osm-tile-server-status inprogress
-    osm-tile-server-download Norway
+    osm-tile-server-download
     osm-tile-server-import /var/cache/osm-tile-server-base/downloaded.osm.pbf
     osm-tile-server-status done
 else
diff --git a/src/Makefile b/src/Makefile
index 800fa28..b8cd0b2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,12 +1,12 @@
 
 
-default: osm-tile-server-import
+default: osm-tile-server-import-raw
 
 install: default
 	mkdir -p ${DESTDIR}/usr/lib/osm-tile-server-base/bin
-	install osm-tile-server-import ${DESTDIR}/usr/lib/osm-tile-server-base/bin/
+	install osm-tile-server-import-raw ${DESTDIR}/usr/lib/osm-tile-server-base/bin/
 
-osm-tile-server-import: osm-tile-server-import.o parse-settings.o
+osm-tile-server-import-raw: osm-tile-server-import.o parse-settings.o
 	${CC} ${LDFLAGS} -o osm-tile-server-import osm-tile-server-import.o parse-settings.o
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-tile-server.git