fix some download-urls, fix git checkout

diff --git a/make/archives.mk b/make/archives.mk
index ca4fddb2fc6d25fb70606cb6a0c7ef299795f367..52502e2ff6ad96c32ce79066f28414a2228926fd 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -73,7 +73,7 @@ $(ARCHIVE)/openssl-1.0.0e.tar.gz:
        $(WGET) http://www.fhloston-paradise.de/openssl-1.0.0e.tar.gz
 
 $(ARCHIVE)/ffmpeg-0.5.tar.bz2:
-       $(WGET) http://www.fhloston-paradise.deffmpeg-0.5.tar.bz2
+       $(WGET) http://www.fhloston-paradise.de/ffmpeg-0.5.tar.bz2
 
 $(ARCHIVE)/ffmpeg-0.8.6.tar.gz:
        $(WGET) http://www.fhloston-paradise.de/ffmpeg-0.8.6.tar.gz
@@ -106,7 +106,7 @@ $(ARCHIVE)/rsync-3.0.8.tar.gz:
        $(WGET) http://www.fhloston-paradise.de/rsync-3.0.8.tar.gz
 
 $(ARCHIVE)/procps-3.2.7.tar.gz:
-       $(WGET) http://www.fhloston-paradise.deprocps-3.2.7.tar.gz
+       $(WGET) http://www.fhloston-paradise.de/procps-3.2.7.tar.gz
 
 $(ARCHIVE)/procps-3.2.8.tar.gz:
        $(WGET) http://www.dbox2world.net/download/procps-3.2.8.tar.gz

diff --git a/make/prerequisites.mk b/make/prerequisites.mk
index 627bba6b5f46d1a330e09fc93d4b5dba0925da35..82e0523e8b2e8353c6ffdad541e621de235855f1 100755 (executable)
--- a/make/prerequisites.mk
+++ b/make/prerequisites.mk
@@ -137,7 +137,7 @@ $(GIT_LIBRARIES)/dvbsi:
                else \
                        git clone $(CSGIT)/cst-public-libraries-dvbsi.git/ dvbsi; \
                        cd $(GIT_LIBRARIES)/dvbsi && \
-                       git checkout --track master origin/master; \
+                       git checkout --track -b master origin/master; \
                fi
 
 $(GIT_LIBRARIES)/ffmpeg:
@@ -149,7 +149,7 @@ $(GIT_LIBRARIES)/ffmpeg:
                else \
                        git clone $(CSGIT)/cst-public-libraries-ffmpeg.git/ ffmpeg; \
                        cd $(GIT_LIBRARIES)/ffmpeg && \
-                       git checkout --track master origin/master; \
+                       git checkout --track -b master origin/master; \
                fi
 
 $(GIT_DRIVERS):
@@ -162,7 +162,7 @@ $(GIT_DRIVERS):
                        cd $(SOURCE_DIR)/git; \
                        git clone $(CSGIT)/cst-public-drivers.git/ DRIVERS; \
                        cd $(GIT_DRIVERS) && \
-                       git checkout --track master origin/master; \
+                       git checkout --track -b master origin/master; \
                fi
 
 # hack to make sure they are always copied