news/husky-devel: fix non-gcc builds

PR:		192574
Submitted by:	maintainer (Oleg Sharoyko)

2 files changed, 41 insertions, 9 deletions

diff --git a/news/husky-devel/files/patch-fidoconf_makefile.in2 b/news/husky-devel/files/patch-fidoconf_makefile.in2
new file mode 100644
index 000000000000..716ddc893298
--- /dev/null
+++ b/news/husky-devel/files/patch-fidoconf_makefile.in2
@@ -0,0 +1,11 @@
+--- fidoconf/makefile.in2.orig	2014-08-10 22:55:10.000000000 +0100
++++ fidoconf/makefile.in2	2014-08-10 22:55:27.000000000 +0100
+@@ -2,7 +2,7 @@
+ # (legacy makefile, no dynlibs, no huskymak support)
+ # this file is only a include file included by other files.
+ 
+-CC   = gcc
++#CC   = gcc
+ EXENAMEFLAG = -o
+ AR   = ar
+ AR_R = rs
diff --git a/news/husky-devel/files/patch-huskybse_huskymak.cfg b/news/husky-devel/files/patch-huskybse_huskymak.cfg
index 61a1e6485936..ec053e956e85 100644
--- a/news/husky-devel/files/patch-huskybse_huskymak.cfg
+++ b/news/husky-devel/files/patch-huskybse_huskymak.cfg
@@ -1,6 +1,6 @@
 --- huskybse/huskymak.cfg.orig	2007-02-23 21:47:15.000000000 +0000
-+++ huskybse/huskymak.cfg	2013-03-25 19:36:08.000000000 +0000
-@@ -38,7 +38,7 @@ CFGDIR=$(PREFIX)/etc/fido
++++ huskybse/huskymak.cfg	2014-08-10 22:33:05.000000000 +0100
+@@ -38,7 +38,7 @@
  # will not be compiled, and you won't know how to use the software ;-).
  # You should take care that this directory is listed in the INFOPATH 
  # environment variable (if necessary, modify your /etc/profile file).
@@ -9,7 +9,7 @@
  
  # The same as above, but for DVI documentation. This requires a working
  # "texi2dvi" program.
-@@ -46,7 +46,7 @@ CFGDIR=$(PREFIX)/etc/fido
+@@ -46,7 +46,7 @@
  
  # The same as above, but for HTML documentation. This requires a working
  # "texi2html" program.
@@ -18,7 +18,28 @@
  
  # Name of the config file of MSGED TE:
  MSGEDCFG=\"$(CFGDIR)/msged.cfg\"
-@@ -102,7 +102,7 @@ RM=rm
+@@ -66,10 +66,10 @@
+ ##############################################################################
+ 
+ # C-Compiler
+-CC=gcc
++#CC=gcc
+ 
+ # C++-Compiler
+-CXX=g++
++#CXX=g++
+ 
+ #Msged needs access to a termcap library. Define its name here.
+ #On Linux, termcap is integrated into ncurses:
+@@ -95,14 +95,14 @@
+ # On Solaris use "-G" as additional linkerflag !!!!!!!
+ # MKSHARED=ld
+ # LD=ld -G
+-MKSHARED=gcc 
++MKSHARED=$(CC)
+ 
+ # remove file
+ RM=rm
  
  # The "install" program.
  # On Linux and FreeBSD/NetBSD, use this:
@@ -27,7 +48,7 @@
  # On Tru64 Unix, use this:
  # INSTALL=installbsd
  # On Solaris, use this:
-@@ -116,7 +116,7 @@ MKDIR=mkdir
+@@ -116,7 +116,7 @@
  
  # update dynamic library cache
  # If your operating system does not need this, you may comment out this line.
@@ -36,7 +57,7 @@
  
  # rename a file
  MV=mv
-@@ -139,8 +139,8 @@ H2PAS=h2pas
+@@ -139,8 +139,8 @@
  OSTYPE=UNIX
  
  # short name of operating system (used for PID lines etc.)
@@ -47,7 +68,7 @@
  #UNAME=OS2
  #UNAME=BEOS
  
-@@ -151,7 +151,7 @@ DEBUG=0
+@@ -151,7 +151,7 @@
  SHORTNAMES=0
  
  # Perl support
@@ -56,7 +77,7 @@
  
  # ZipInternal packer
  USE_HPTZIP=0
-@@ -179,7 +179,7 @@ EXENAMEFLAG=-o
+@@ -179,7 +179,7 @@
  WARNFLAGS=-Wall
  
  # C-compiler: optimization
@@ -65,7 +86,7 @@
  
  ifeq ( $(DYNLIBS), 0 )
    ifeq ($(OSTYPE), UNIX)
-@@ -216,29 +216,22 @@ OPTLFLAGS=-s
+@@ -216,29 +216,22 @@
  DEBLFLAGS=-g
  
  # options for installing programs