From 13260844178282515c0d5e85a4d2fc1af8c638dc Mon Sep 17 00:00:00 2001 From: heinz Date: Tue, 16 Dec 2003 22:54:13 +0000 Subject: Allow _PATCH_BACKUP_ARG to be overridden in /etc/mk.conf (in order to use different patch programs). Ok by agc --- mk/defs.AIX.mk | 4 ++-- mk/defs.BSDOS.mk | 4 ++-- mk/defs.Darwin.mk | 4 ++-- mk/defs.FreeBSD.mk | 4 ++-- mk/defs.IRIX.mk | 4 ++-- mk/defs.Linux.mk | 4 ++-- mk/defs.NetBSD.mk | 4 ++-- mk/defs.OpenBSD.mk | 6 +++--- mk/defs.SunOS.mk | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) (limited to 'mk') diff --git a/mk/defs.AIX.mk b/mk/defs.AIX.mk index 694fccdc341..be470d5221b 100644 --- a/mk/defs.AIX.mk +++ b/mk/defs.AIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.AIX.mk,v 1.1 2003/12/03 17:57:33 erh Exp $ +# $NetBSD: defs.AIX.mk,v 1.2 2003/12/16 22:54:13 heinz Exp $ # # Variable definitions for the AIX operating system. @@ -153,7 +153,7 @@ _OPSYS_PERL_REQD= # no base version of perl required _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads _OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker _PATCH_CAN_BACKUP= yes # native patch(1) can make backups -_PATCH_BACKUP_ARG= -b -V simple -z # switch to patch(1) for backup suffix +_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix _PREFORMATTED_MAN_DIR= cat # directory where catman pages are _USE_GNU_GETTEXT= no # Don't use GNU gettext _USE_RPATH= yes # add rpath to LDFLAGS diff --git a/mk/defs.BSDOS.mk b/mk/defs.BSDOS.mk index 08e3b27e2ef..25557be49eb 100644 --- a/mk/defs.BSDOS.mk +++ b/mk/defs.BSDOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.BSDOS.mk,v 1.2 2003/12/11 22:42:17 reed Exp $ +# $NetBSD: defs.BSDOS.mk,v 1.3 2003/12/16 22:54:13 heinz Exp $ # # Variable definitions for the BSD/OS operating system. @@ -139,7 +139,7 @@ _OPSYS_PERL_REQD= # no base version of perl required _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads _OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker _PATCH_CAN_BACKUP= yes # native patch(1) can make backups -_PATCH_BACKUP_ARG= -V simple -b -z # switch to patch(1) for backup suffix +_PATCH_BACKUP_ARG?= -V simple -b -z # switch to patch(1) for backup suffix _PREFORMATTED_MAN_DIR= cat # directory where catman pages are _USE_GNU_GETTEXT= no # Don't use GNU gettext _USE_RPATH= yes # add rpath to LDFLAGS diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk index 7eff6384c1a..f0294ed25cc 100644 --- a/mk/defs.Darwin.mk +++ b/mk/defs.Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Darwin.mk,v 1.62 2003/12/04 06:07:49 grant Exp $ +# $NetBSD: defs.Darwin.mk,v 1.63 2003/12/16 22:54:13 heinz Exp $ # # Variable definitions for the Darwin operating system. @@ -122,7 +122,7 @@ _OPSYS_PERL_REQD= 5.8.0 # base version of perl required _OPSYS_PTHREAD_AUTO= yes # -lpthread not needed for pthreads _OPSYS_RPATH_NAME= -L # darwin has no rpath, use -L instead _PATCH_CAN_BACKUP= yes # native patch(1) can make backups -_PATCH_BACKUP_ARG= -V simple -b -z # switch to patch(1) for backup suffix +_PATCH_BACKUP_ARG?= -V simple -b -z # switch to patch(1) for backup suffix _PREFORMATTED_MAN_DIR= cat # directory where catman pages are _USE_GNU_GETTEXT= no # Don't use GNU gettext _USE_RPATH= no # don't add rpath to LDFLAGS diff --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk index b05b661aa65..0296515cc48 100644 --- a/mk/defs.FreeBSD.mk +++ b/mk/defs.FreeBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.FreeBSD.mk,v 1.26 2003/10/26 00:07:31 grant Exp $ +# $NetBSD: defs.FreeBSD.mk,v 1.27 2003/12/16 22:54:13 heinz Exp $ # # Variable definitions for the FreeBSD operating system. @@ -137,7 +137,7 @@ _OPSYS_PERL_REQD= # no base version of perl required _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads _OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker _PATCH_CAN_BACKUP= yes # native patch(1) can make backups -_PATCH_BACKUP_ARG= -V simple -b # switch to patch(1) for backup suffix +_PATCH_BACKUP_ARG?= -V simple -b # switch to patch(1) for backup suffix _PREFORMATTED_MAN_DIR= cat # directory where catman pages are _USE_GNU_GETTEXT= no # Don't use GNU gettext _USE_RPATH= yes # add rpath to LDFLAGS diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk index 7d237ada715..573c7c911c8 100644 --- a/mk/defs.IRIX.mk +++ b/mk/defs.IRIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.IRIX.mk,v 1.37 2003/10/19 07:38:31 grant Exp $ +# $NetBSD: defs.IRIX.mk,v 1.38 2003/12/16 22:54:13 heinz Exp $ # # Variable definitions for the IRIX operating system. @@ -133,7 +133,7 @@ _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads _OPSYS_RPATH_NAME= -rpath, # name of symbol in rpath directive to linker .if defined(_OPSYS_GPATCH_REQD) && ${_OPSYS_GPATCH_REQD} == "YES" _PATCH_CAN_BACKUP= yes # patch(1) can make backups -_PATCH_BACKUP_ARG= -b -V simple -z # switch to patch(1) for backup suffix +_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix .else _PATCH_CAN_BACKUP= no # native patch(1) can make backups .endif diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk index 73d5c46d1c5..7b1f212e61a 100644 --- a/mk/defs.Linux.mk +++ b/mk/defs.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Linux.mk,v 1.61 2003/10/19 06:54:17 grant Exp $ +# $NetBSD: defs.Linux.mk,v 1.62 2003/12/16 22:54:13 heinz Exp $ # # Variable definitions for the Linux operating system. @@ -167,7 +167,7 @@ _OPSYS_PERL_REQD= # no base version of perl required _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads _OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker _PATCH_CAN_BACKUP= yes # native patch(1) can make backups -_PATCH_BACKUP_ARG= -b -V simple -z # switch to patch(1) for backup suffix +_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix _PREFORMATTED_MAN_DIR= cat # directory where catman pages are _USE_GNU_GETTEXT= no # Don't use GNU gettext _USE_RPATH= yes # add rpath to LDFLAGS diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk index 11341e4cbdc..6c4f5906678 100644 --- a/mk/defs.NetBSD.mk +++ b/mk/defs.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.NetBSD.mk,v 1.56 2003/12/10 13:37:48 grant Exp $ +# $NetBSD: defs.NetBSD.mk,v 1.57 2003/12/16 22:54:13 heinz Exp $ # # Variable definitions for the NetBSD operating system. @@ -135,7 +135,7 @@ _OPSYS_PERL_REQD= # no base version of perl required _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads _OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker _PATCH_CAN_BACKUP= yes # native patch(1) can make backups -_PATCH_BACKUP_ARG= -V simple -b # switch to patch(1) for backup suffix +_PATCH_BACKUP_ARG?= -V simple -b # switch to patch(1) for backup suffix _PREFORMATTED_MAN_DIR= cat # directory where catman pages are _USE_GNU_GETTEXT= no # Don't use GNU gettext _USE_RPATH= yes # add rpath to LDFLAGS diff --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk index 822aab179db..926a6d76820 100644 --- a/mk/defs.OpenBSD.mk +++ b/mk/defs.OpenBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.OpenBSD.mk,v 1.25 2003/09/24 06:26:21 itojun Exp $ +# $NetBSD: defs.OpenBSD.mk,v 1.26 2003/12/16 22:54:13 heinz Exp $ # # Variable definitions for the OpenBSD operating system. @@ -128,9 +128,9 @@ _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads _OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker _PATCH_CAN_BACKUP= yes # native patch(1) can make backups .if ${OS_VERSION} >= 3.4 -_PATCH_BACKUP_ARG= -V simple -z # switch to patch(1) for backup suffix +_PATCH_BACKUP_ARG?= -V simple -z # switch to patch(1) for backup suffix .else -_PATCH_BACKUP_ARG= -V simple -b # switch to patch(1) for backup suffix +_PATCH_BACKUP_ARG?= -V simple -b # switch to patch(1) for backup suffix .endif _PREFORMATTED_MAN_DIR= cat # directory where catman pages are _USE_GNU_GETTEXT= no # Don't use GNU gettext diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index d53a656d84d..351ae561e92 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.72 2003/10/19 07:38:31 grant Exp $ +# $NetBSD: defs.SunOS.mk,v 1.73 2003/12/16 22:54:13 heinz Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -129,7 +129,7 @@ _OPSYS_PERL_REQD= # no base version of perl required _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads _OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker _PATCH_CAN_BACKUP= yes # native patch(1) can make backups -_PATCH_BACKUP_ARG= -b -V simple -z # switch to patch(1) for backup suffix +_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix _PREFORMATTED_MAN_DIR= man # directory where catman pages are _USE_GNU_GETTEXT= yes # Use GNU gettext _USE_RPATH= yes # add rpath to LDFLAGS -- cgit v1.2.3