diff options
Diffstat (limited to 'news/husky/files/patch-huskybse_huskymak.cfg')
| -rw-r--r-- | news/husky/files/patch-huskybse_huskymak.cfg | 67 |
1 files changed, 51 insertions, 16 deletions
diff --git a/news/husky/files/patch-huskybse_huskymak.cfg b/news/husky/files/patch-huskybse_huskymak.cfg index ec053e956e85..04d5478d286d 100644 --- a/news/husky/files/patch-huskybse_huskymak.cfg +++ b/news/husky/files/patch-huskybse_huskymak.cfg @@ -1,6 +1,6 @@ ---- huskybse/huskymak.cfg.orig 2007-02-23 21:47:15.000000000 +0000 -+++ huskybse/huskymak.cfg 2014-08-10 22:33:05.000000000 +0100 -@@ -38,7 +38,7 @@ +--- huskybse/huskymak.cfg.orig 2020-01-16 23:01:53 UTC ++++ huskybse/huskymak.cfg +@@ -38,7 +38,7 @@ CFGDIR=$(PREFIX)/etc/fido # 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 @@ +@@ -46,7 +46,7 @@ CFGDIR=$(PREFIX)/etc/fido # The same as above, but for HTML documentation. This requires a working # "texi2html" program. @@ -18,20 +18,47 @@ # Name of the config file of MSGED TE: MSGEDCFG=\"$(CFGDIR)/msged.cfg\" -@@ -66,10 +66,10 @@ +@@ -54,7 +54,7 @@ MSGEDCFG=\"$(CFGDIR)/msged.cfg\" + + ############################################################################## + #PART 2: PLATFORM DEPENDENT SECTION +-#If you are running Linux with GNU gcc, you don't need to modify anything in ++#If you are running Linux with GNU cc, you don't need to modify anything in + #the following sections. If you are running any other operating system or using + #any other C compiler, you should check the values. For some operating + #systems, the comments contain information on what you need to change. +@@ -66,10 +66,10 @@ MSGEDCFG=\"$(CFGDIR)/msged.cfg\" ############################################################################## # C-Compiler -CC=gcc -+#CC=gcc ++#CC=cc # C++-Compiler -CXX=g++ -+#CXX=g++ ++#CXX=c++ #Msged needs access to a termcap library. Define its name here. #On Linux, termcap is integrated into ncurses: -@@ -95,14 +95,14 @@ +@@ -79,7 +79,7 @@ TERMCAP=ncurses + #TERMCAP=terminfo + + # C++-Compiler +-GPP=g++ ++GPP=c++ + + # Pascal-Compiler (the compiler is optional, but the value of this + # variable must be defined even if you don't have a Pascal compiler). +@@ -89,20 +89,20 @@ PC=ppc386 + AR=ar + + # how to build shared libraries +-# use gcc on Linux and FreeBSD +-# use ld on BeOS and also try ld if gcc does not work for you +-# only "gcc" will put so version numbers into the shared object ++# use cc on Linux and FreeBSD ++# use ld on BeOS and also try ld if cc does not work for you ++# only "cc" will put so version numbers into the shared object # On Solaris use "-G" as additional linkerflag !!!!!!! # MKSHARED=ld # LD=ld -G @@ -48,7 +75,7 @@ # On Tru64 Unix, use this: # INSTALL=installbsd # On Solaris, use this: -@@ -116,7 +116,7 @@ +@@ -116,7 +116,7 @@ MKDIR=mkdir # update dynamic library cache # If your operating system does not need this, you may comment out this line. @@ -57,7 +84,7 @@ # rename a file MV=mv -@@ -139,8 +139,8 @@ +@@ -139,8 +139,8 @@ H2PAS=h2pas OSTYPE=UNIX # short name of operating system (used for PID lines etc.) @@ -68,7 +95,7 @@ #UNAME=OS2 #UNAME=BEOS -@@ -151,7 +151,7 @@ +@@ -151,14 +151,14 @@ DEBUG=0 SHORTNAMES=0 # Perl support @@ -77,7 +104,15 @@ # ZipInternal packer USE_HPTZIP=0 -@@ -179,7 +179,7 @@ + + # The DYNLIBS switch controls if dynamic or static linkage is used. + # This is tricky. If you set DYNLIBS=1, dynamic libraries (.so files) +-# will be generated and used. This will only work if you are running "gcc" ++# will be generated and used. This will only work if you are running "cc" + # on Linux, FreeBSD or another real Unix operating system. + + # On other systems, you must set DYNLIBS=0. Even on Linux, you might +@@ -179,7 +179,7 @@ EXENAMEFLAG=-o WARNFLAGS=-Wall # C-compiler: optimization @@ -86,20 +121,20 @@ ifeq ( $(DYNLIBS), 0 ) ifeq ($(OSTYPE), UNIX) -@@ -216,29 +216,22 @@ +@@ -216,29 +216,22 @@ OPTLFLAGS=-s DEBLFLAGS=-g # options for installing programs -OPTIBOPT=-c -s -m 555 -DEBIBOPT=-c -m 555 -- ++IBOPT=$(BSD_INSTALL_PROGRAM) + -ifeq ($(DEBUG), 1) - IBOPT = $(DEBIBOPT) -else - IBOPT = $(OPTIBOPT) -endif -+IBOPT=$(BSD_INSTALL_PROGRAM) - +- # options for installing scripts -ISOPT=-c -m 555 +ISOPT=$(BSD_INSTALL_SCRIPT) |