Mercurial > mxe-octave

changeset 1946:c6831f324cc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved coding style regarding creation of symlinks
author Volker Grabsch <vog@notjusthosting.com>
date Mon, 15 Aug 2011 12:40:35 +0200
parents 4b6d463ce354
children bd2c578f0833
files src/cblas.mk src/fltk.mk src/gdal.mk src/gsoap.mk src/sdl.mk src/xvidcore.mk
diffstat 6 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/cblas.mk	Mon Aug 15 08:10:28 2011 +0200
+++ b/src/cblas.mk	Mon Aug 15 12:40:35 2011 +0200
@@ -23,7 +23,7 @@
     $(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
--- a/src/fltk.mk	Mon Aug 15 08:10:28 2011 +0200
+++ b/src/fltk.mk	Mon Aug 15 12:40:35 2011 +0200
@@ -33,7 +33,7 @@
     # 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 \
--- a/src/gdal.mk	Mon Aug 15 08:10:28 2011 +0200
+++ b/src/gdal.mk	Mon Aug 15 12:40:35 2011 +0200
@@ -85,5 +85,5 @@
     $(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
--- a/src/gsoap.mk	Mon Aug 15 08:10:28 2011 +0200
+++ b/src/gsoap.mk	Mon Aug 15 12:40:35 2011 +0200
@@ -43,7 +43,7 @@
         --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'
--- a/src/sdl.mk	Mon Aug 15 08:10:28 2011 +0200
+++ b/src/sdl.mk	Mon Aug 15 12:40:35 2011 +0200
@@ -30,7 +30,7 @@
         --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 \
--- a/src/xvidcore.mk	Mon Aug 15 08:10:28 2011 +0200
+++ b/src/xvidcore.mk	Mon Aug 15 12:40:35 2011 +0200
@@ -30,5 +30,5 @@
     $(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