[PATCH] Allow the user to choose between our strl*() and the environment's

From: sin <sin_AT_2f30.org>
Date: Thu, 30 Jan 2014 18:06:22 +0000

---
 Makefile  | 6 ++----
 config.mk | 6 ++++++
 2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 8a6790e..613cd44 100644
--- a/Makefile
+++ b/Makefile
_AT_@ -4,7 +4,7 @@ include config.mk
 .SUFFIXES: .c .o
 
 HDR = crypt.h fs.h text.h md5.h sha1.h sha256.h sha512.h util.h arg.h
-LIB = \
+LIB += \
 	util/afgets.o    \
 	util/agetcwd.o   \
 	util/apathmax.o  \
_AT_@ -22,9 +22,7 @@ LIB = \
 	util/rm.o        \
 	util/sha1.o      \
 	util/sha256.o    \
-	util/sha512.o    \
-	util/strlcat.o   \
-	util/strlcpy.o
+	util/sha512.o
 
 SRC = \
 	basename.c \
diff --git a/config.mk b/config.mk
index a3ffc4d..91baa7a 100644
--- a/config.mk
+++ b/config.mk
_AT_@ -5,6 +5,12 @@ VERSION = 0.0
 PREFIX = /usr/local
 MANPREFIX = $(PREFIX)/share/man
 
+# Some systems might provide strl*() functions as macros
+# so just comment out the following lines.
+LIB      = \
+	util/strlcpy.o \
+	util/strlcat.o
+
 #CC = gcc
 #CC = musl-gcc
 LD = $(CC)
-- 
1.8.5.3
--FCuugMFkClbJLl1L--
Received on Mon Sep 17 2001 - 00:00:00 CEST

This archive was generated by hypermail 2.3.0 : Thu Jan 30 2014 - 19:12:10 CET