Install db-Makefile

This commit is contained in:
Ulrich Drepper 2011-06-15 21:26:56 -04:00
parent 40c1b22cd7
commit 77fb911743
3 changed files with 14 additions and 0 deletions

View File

@ -1,5 +1,8 @@
2011-06-15 Ulrich Drepper <drepper@gmail.com> 2011-06-15 Ulrich Drepper <drepper@gmail.com>
* Makeconfig: Define vardbdir and inst_vardbdir.
* nss/Makefile: Add rules to install db-Makefile.
* nss/nss_db/db-XXX.c: Cleanup. * nss/nss_db/db-XXX.c: Cleanup.
* nss/Makefile (libnss_db-dbs): Add db-initgroups. * nss/Makefile (libnss_db-dbs): Add db-initgroups.

View File

@ -291,6 +291,12 @@ sysconfdir = $(prefix)/etc
endif endif
inst_sysconfdir = $(install_root)$(sysconfdir) inst_sysconfdir = $(install_root)$(sysconfdir)
# Directory for the database files and Makefile for nss_db.
ifndef vardbdir
vardbdir = /var/db
endif
inst_vardbdir = $(install_root)$(vardbdir)
# What timezone should be the installed default (e.g., US/Eastern). # What timezone should be the installed default (e.g., US/Eastern).
# Run `make -C time echo-zonenames' to see a list of available zone names. # Run `make -C time echo-zonenames' to see a list of available zone names.
# The local timezone can be changed with `zic -l TIMEZONE' at any time. # The local timezone can be changed with `zic -l TIMEZONE' at any time.

View File

@ -78,6 +78,8 @@ generated += $(filter-out db-alias.c db-netgrp.c, \
$(addsuffix .c,$(libnss_db-dbs))) $(addsuffix .c,$(libnss_db-dbs)))
distribute += $(addprefix nss_db/, db-XXX.c nss_db.h) distribute += $(addprefix nss_db/, db-XXX.c nss_db.h)
install-others += $(inst_vardbdir)/Makefile
# Build static module if requested # Build static module if requested
ifneq ($(build-static-nss),yes) ifneq ($(build-static-nss),yes)
libnss_files-inhibit-o = $(filter-out .os,$(object-suffixes)) libnss_files-inhibit-o = $(filter-out .os,$(object-suffixes))
@ -114,6 +116,9 @@ $(libnss_db-dbs:%=$(objpfx)%.c): $(objpfx)db-%.c: nss_files/files-%.c
$(objpfx)makedb: $(makedb-modules:%=$(objpfx)%.o) $(objpfx)makedb: $(makedb-modules:%=$(objpfx)%.o)
$(inst_vardbdir)/Makefile: db-Makefile $(+force)
$(do-install)
distribute += nss_test1.c distribute += nss_test1.c
CFLAGS-nss_test1.c = -DNOT_IN_libc=1 CFLAGS-nss_test1.c = -DNOT_IN_libc=1