aboutsummaryrefslogtreecommitdiff
path: root/Makeconfig
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-06-22 09:00:11 +0000
committerRoland McGrath <roland@gnu.org>1995-06-22 09:00:11 +0000
commit487253ea1f81b8223334200ada86a3d3b7de6d9c (patch)
tree0befcdc81388e86f1e550635437ffa0385cf34dc /Makeconfig
parentb1099b2fba10e78325715f65e23af286705bf86e (diff)
downloadglibc-487253ea1f81b8223334200ada86a3d3b7de6d9c.tar
glibc-487253ea1f81b8223334200ada86a3d3b7de6d9c.tar.gz
glibc-487253ea1f81b8223334200ada86a3d3b7de6d9c.tar.bz2
glibc-487253ea1f81b8223334200ada86a3d3b7de6d9c.zip
Tue Jun 20 02:18:19 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* 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.
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makeconfig b/Makeconfig
index 620f23d991..b63dabb831 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