mandoc: make the path to ar(1) configurable, needed by NixOS; suggested

mandoc: make the path to ar(1) configurable, needed by NixOS; suggested

[schwarze]

Log Message:
-----------
make the path to ar(1) configurable, needed by NixOS;
suggested by Lukas Epple <sternenseemann at systemli dot org>

Modified Files:
--------------
    mandoc:
        configure
        configure.local.example
        Makefile

Revision Data
-------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mandoc/mandoc/Makefile,v
retrieving revision 1.538
retrieving revision 1.539
diff -LMakefile -LMakefile -u -p -r1.538 -r1.539
--- Makefile
+++ Makefile
@@ -513,7 +513,7 @@ Makefile.local config.h: configure $(TES
 	@exit 1
 
 libmandoc.a: $(MANDOC_COBJS) $(LIBMANDOC_OBJS)
-	ar rs $@ $(MANDOC_COBJS) $(LIBMANDOC_OBJS)
+	$(AR) rs $@ $(MANDOC_COBJS) $(LIBMANDOC_OBJS)
 
 mandoc: $(MAIN_OBJS) libmandoc.a
 	$(CC) -o $@ $(LDFLAGS) $(MAIN_OBJS) libmandoc.a $(LDADD)
Index: configure
===================================================================
RCS file: /home/cvs/mandoc/mandoc/configure,v
retrieving revision 1.80
retrieving revision 1.81
diff -Lconfigure -Lconfigure -u -p -r1.80 -r1.81
--- configure
+++ configure
@@ -41,6 +41,7 @@ OSENUM=
 OSNAME=
 UTF8_LOCALE=
 
+AR=ar
 CC=cc
 CFLAGS=
 FATAL=0
@@ -634,6 +635,7 @@ INSTALL_TARGETS=
 cat << __HEREDOC__
 BUILD_TARGETS	= ${BUILD_TARGETS}
 INSTALL_TARGETS	= ${INSTALL_TARGETS}
+AR		= ${AR}
 CC		= ${CC}
 CFLAGS		= ${CFLAGS}
 LDADD		= ${LDADD}
Index: configure.local.example
===================================================================
RCS file: /home/cvs/mandoc/mandoc/configure.local.example,v
retrieving revision 1.41
retrieving revision 1.42
diff -Lconfigure.local.example -Lconfigure.local.example -u -p -r1.41 -r1.42
--- configure.local.example
+++ configure.local.example
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright (c) 2014-2019 Ingo Schwarze <schwarze@openbsd.org>
+# Copyright (c) 2014-2021 Ingo Schwarze <schwarze@openbsd.org>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -35,6 +35,11 @@ CC=gcc
 
 # IBM AIX may need:
 CC=xlc
+
+# By default, "ar" is used as the library archive builder, but it
+# can be overridden.  For example, NixOS may not have ar(1) in the
+# PATH, but may want to specify an absolute path instead.
+AR=ar
 
 # For -Tutf8 and -Tlocale operation, mandoc(1) requires <locale.h>
 # providing setlocale(3) and <wchar.h> providing wcwidth(3) and
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv