From 487253ea1f81b8223334200ada86a3d3b7de6d9c Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 22 Jun 1995 09:00:11 +0000 Subject: Tue Jun 20 02:18:19 1995 Roland McGrath * Makerules (lib%.so: lib%_pic.a): Pass -soname switch giving the library's name including $(libprefix) and major version number. * locale/locale-ctype.c (allocate_arrays): Use xmalloc and bzero in place of xcalloc. * Makeconfig (prefix, exec_prefix, libprefix): Instead of `ifndef', use the $(origin) function to only set these if they are undefined, and not if they are defined to empty. * gnu-versions.h: New file. * features.h (__GNU_LIBRARY__): Increase value to 5. --- Makeconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makeconfig') diff --git a/Makeconfig b/Makeconfig index 620f23d..b63dabb 100644 --- a/Makeconfig +++ b/Makeconfig @@ -115,12 +115,12 @@ export sysdep_dir := $(sysdep_dir) # Common prefix for machine-independent installation directories. -ifndef prefix +ifeq ($(origin prefix),undefined) # ifndef would override explicit empty value. prefix = /usr/local endif # Common prefix for machine-dependent installation directories. -ifndef exec_prefix +ifeq ($(origin exec_prefix),undefined) exec_prefix = $(prefix) endif @@ -133,7 +133,7 @@ endif # the prefix is spliced between `lib' and the name, so the linker switch # `-l$(libprefix)NAME' finds the library; for other files the prefix is # just prepended to the whole file name. -ifndef libprefix +ifeq ($(origin libprefix),undefined) libprefix = endif -- cgit v1.1