From 98a2ee286de9ef7410df9e9a10a117e453df9a50 Mon Sep 17 00:00:00 2001
From: Volker Grabsch <vog@notjusthosting.com>
Date: Mon, 15 Aug 2011 12:40:35 +0200
Subject: [PATCH] improved coding style regarding creation of symlinks

---
 src/cblas.mk    | 2 +-
 src/fltk.mk     | 2 +-
 src/gdal.mk     | 2 +-
 src/gsoap.mk    | 2 +-
 src/sdl.mk      | 2 +-
 src/xvidcore.mk | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/cblas.mk b/src/cblas.mk
index 52c8b3cf..52178797 100644
--- a/src/cblas.mk
+++ b/src/cblas.mk
@@ -23,7 +23,7 @@ define $(PKG)_BUILD
     $(SED) -i 's,FC =.*,FC = $(TARGET)-gfortran,g' '$(1)/Makefile.MINGW32'
     $(SED) -i 's, make , $(MAKE) ,g'               '$(1)/Makefile'
     rm '$(1)/Makefile.in'
-    ln -s '$(1)/Makefile.MINGW32' '$(1)/Makefile.in'
+    ln -sf '$(1)/Makefile.MINGW32' '$(1)/Makefile.in'
     mkdir '$(1)/MINGW32'
     $(MAKE) -C '$(1)' -j '$(JOBS)' alllib
     cd '$(1)' && $(TARGET)-ar cr libcblas.a src/*.o
diff --git a/src/fltk.mk b/src/fltk.mk
index c33270ca..631f2a90 100644
--- a/src/fltk.mk
+++ b/src/fltk.mk
@@ -33,7 +33,7 @@ define $(PKG)_BUILD
     # enable exceptions, because disabling them doesn't make any sense on PCs
     $(SED) -i 's,-fno-exceptions,,' '$(1)/makeinclude'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install DIRS=src LIBCOMMAND='$(TARGET)-ar cr'
-    ln -sf $(PREFIX)/$(TARGET)/bin/fltk-config $(PREFIX)/bin/$(TARGET)-fltk-config
+    ln -sf '$(PREFIX)/$(TARGET)/bin/fltk-config' '$(PREFIX)/bin/$(TARGET)-fltk-config'
     
     '$(TARGET)-g++' \
         -W -Wall -Werror -pedantic -ansi \
diff --git a/src/gdal.mk b/src/gdal.mk
index cfae6787..c2c2ffd5 100644
--- a/src/gdal.mk
+++ b/src/gdal.mk
@@ -85,5 +85,5 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)/alg'   -j 1 install
     $(MAKE) -C '$(1)/ogr'   -j 1 install OGR_ENABLED=
     $(MAKE) -C '$(1)/apps'  -j 1 install BIN_LIST=
-    ln -sf $(PREFIX)/$(TARGET)/bin/gdal-config $(PREFIX)/bin/$(TARGET)-gdal-config
+    ln -sf '$(PREFIX)/$(TARGET)/bin/gdal-config' '$(PREFIX)/bin/$(TARGET)-gdal-config'
 endef
diff --git a/src/gsoap.mk b/src/gsoap.mk
index 212b73e6..92df829e 100644
--- a/src/gsoap.mk
+++ b/src/gsoap.mk
@@ -43,7 +43,7 @@ define $(PKG)_BUILD
         --enable-gnutls
 
     # Building for mingw requires native soapcpp2
-    ln -s '$(PREFIX)/bin/$(TARGET)-soapcpp2' '$(1)'/gsoap/src/soapcpp2
+    ln -sf '$(PREFIX)/bin/$(TARGET)-soapcpp2' '$(1)/gsoap/src/soapcpp2'
 
     # Parallel bulds can fail
     $(MAKE) -C '$(1)' -j 1 AR='$(TARGET)-ar'
diff --git a/src/sdl.mk b/src/sdl.mk
index bf6fedeb..0e1f7f3b 100644
--- a/src/sdl.mk
+++ b/src/sdl.mk
@@ -30,7 +30,7 @@ define $(PKG)_BUILD
         --disable-stdio-redirect
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
-    ln -sf $(PREFIX)/$(TARGET)/bin/sdl-config $(PREFIX)/bin/$(TARGET)-sdl-config
+    ln -sf '$(PREFIX)/$(TARGET)/bin/sdl-config' '$(PREFIX)/bin/$(TARGET)-sdl-config'
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
diff --git a/src/xvidcore.mk b/src/xvidcore.mk
index 952a0f34..d45bfa4c 100644
--- a/src/xvidcore.mk
+++ b/src/xvidcore.mk
@@ -30,5 +30,5 @@ define $(PKG)_BUILD
     $(INSTALL) -m644 '$(1)/../../src/xvid.h' '$(PREFIX)/$(TARGET)/include/'
     $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
     $(INSTALL) -m644 '$(1)/build/xvidcore.a' '$(PREFIX)/$(TARGET)/lib/'
-    ln -sf $(PREFIX)/$(TARGET)/lib/xvidcore.a $(PREFIX)/$(TARGET)/lib/libxvidcore.a
+    ln -sf '$(PREFIX)/$(TARGET)/lib/xvidcore.a' '$(PREFIX)/$(TARGET)/lib/libxvidcore.a'
 endef