view src/of-fl-core-1-fixes.patch @ 3432:5fc3d674ca3a

Correctly name output of dist-tar with .tgz, not .zip, extension. * binary-dist-rules.mk: Change dist-tar rule to produce a file with .tgz extension.
author Rik <rik@octave.org>
date Fri, 17 Jan 2014 13:04:28 -0800
parents 207b5f6713d9
children 85568f3159a4
line wrap: on
line source

diff -ur fl-core.orig/src/Makefile fl-core/src/Makefile
--- fl-core.orig/src/Makefile	2014-01-13 21:23:20.000000000 -0500
+++ fl-core/src/Makefile	2014-01-13 21:24:15.000000000 -0500
@@ -1,8 +1,13 @@
 OCT = fl_compose.oct
 SRC := $(OCT:.oct=.cc)
 BASE := $(OCT:.oct=)
-ifdef COMSPEC 
+
+ifneq (,$(findstring mingw,$(shell octave-config -p CANONICAL_HOST_TYPE)))
+	ADDPARAM := -lpthread
+else
+ ifdef COMSPEC 
 	ADDPARAM := -lpthreadVC2
+ endif
 endif
 
 .phony: all