summaryrefslogtreecommitdiff
path: root/usr/src/lib/nsswitch/files
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib/nsswitch/files')
-rw-r--r--usr/src/lib/nsswitch/files/Makefile6
-rw-r--r--usr/src/lib/nsswitch/files/Makefile.com16
-rw-r--r--usr/src/lib/nsswitch/files/amd64/Makefile4
-rw-r--r--usr/src/lib/nsswitch/files/i386/Makefile4
-rw-r--r--usr/src/lib/nsswitch/files/sparc/Makefile4
-rw-r--r--usr/src/lib/nsswitch/files/sparcv9/Makefile4
6 files changed, 23 insertions, 15 deletions
diff --git a/usr/src/lib/nsswitch/files/Makefile b/usr/src/lib/nsswitch/files/Makefile
index fdd66fff3b..ed69fbf8dd 100644
--- a/usr/src/lib/nsswitch/files/Makefile
+++ b/usr/src/lib/nsswitch/files/Makefile
@@ -20,12 +20,9 @@
# CDDL HEADER END
#
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# Copyright (c) 1991 - 1996, by Sun Microsystems, Inc.
# All rights reserved.
#
-# lib/nsswitch/Makefile
include ../../../Makefile.master
@@ -35,11 +32,10 @@ all:= TARGET= all
clean:= TARGET= clean
clobber:= TARGET= clobber
install:= TARGET= install
-lint:= TARGET= lint
.KEEP_STATE:
-all clean clobber install lint: $(FILES_SUBDIRS)
+all clean clobber install: $(FILES_SUBDIRS)
$(MACH) $(MACH64): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/nsswitch/files/Makefile.com b/usr/src/lib/nsswitch/files/Makefile.com
index 1489badee6..e79567aaaf 100644
--- a/usr/src/lib/nsswitch/files/Makefile.com
+++ b/usr/src/lib/nsswitch/files/Makefile.com
@@ -56,10 +56,22 @@ include ../../Makefile.com
include ../../../Makefile.rootfs
CPPFLAGS += -I../../../common/inc
-LINTFLAGS += -erroff=E_GLOBAL_COULD_BE_STATIC2
-LINTFLAGS64 += -erroff=E_GLOBAL_COULD_BE_STATIC2
LDLIBS += -lnsl
DYNLIB1 = nss_files.so$(VERS)
+COMPATLINKS= usr/lib/$(DYNLIB1) \
+ etc/lib/$(DYNLIB1)
+COMPATLINKS64= usr/lib/$(MACH64)/$(DYNLIB1)
+
+$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1)
+$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \
+ COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1)
+$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1)
+$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \
+ COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1)
+
+$(ROOT)/etc/lib/$(DYNLIB1) := COMPATLINKTARGET= ../../lib/$(DYNLIB1)
+
all: $(DYNLIB1)
+
diff --git a/usr/src/lib/nsswitch/files/amd64/Makefile b/usr/src/lib/nsswitch/files/amd64/Makefile
index 1334471b25..2f85b65f33 100644
--- a/usr/src/lib/nsswitch/files/amd64/Makefile
+++ b/usr/src/lib/nsswitch/files/amd64/Makefile
@@ -23,7 +23,7 @@
# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
+
#
include ../Makefile.com
@@ -33,4 +33,4 @@ LIBS = $(DYNLIB1)
include ../../Makefile.targ
-install: all $(ROOT64DYNLIB)
+install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64)
diff --git a/usr/src/lib/nsswitch/files/i386/Makefile b/usr/src/lib/nsswitch/files/i386/Makefile
index 96e5ad1958..8680ea468e 100644
--- a/usr/src/lib/nsswitch/files/i386/Makefile
+++ b/usr/src/lib/nsswitch/files/i386/Makefile
@@ -23,7 +23,7 @@
# Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
+
#
# lib/nsswitch/files/i386/Makefile
@@ -33,4 +33,4 @@ LIBS = $(DYNLIB1)
include ../../Makefile.targ
-install: all $(ROOTLIBS)
+install: all $(ROOTLIBS) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/nsswitch/files/sparc/Makefile b/usr/src/lib/nsswitch/files/sparc/Makefile
index e79a5949bb..13c233f678 100644
--- a/usr/src/lib/nsswitch/files/sparc/Makefile
+++ b/usr/src/lib/nsswitch/files/sparc/Makefile
@@ -23,7 +23,7 @@
# Copyright 1993,2001-2003 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
+
#
# lib/nsswitch/files/sparc/Makefile
@@ -33,4 +33,4 @@ LIBS = $(DYNLIB1)
include ../../Makefile.targ
-install: all $(ROOTLIBS)
+install: all $(ROOTLIBS) $(ROOTCOMPATLINKS)
diff --git a/usr/src/lib/nsswitch/files/sparcv9/Makefile b/usr/src/lib/nsswitch/files/sparcv9/Makefile
index 1c6d8cc170..1509fc0993 100644
--- a/usr/src/lib/nsswitch/files/sparcv9/Makefile
+++ b/usr/src/lib/nsswitch/files/sparcv9/Makefile
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
#
-#ident "%Z%%M% %I% %E% SMI"
+
#
# Copyright (c) 1993,2001 by Sun Microsystems, Inc.
# All rights reserved.
@@ -34,4 +34,4 @@ LIBS = $(DYNLIB1)
include ../../Makefile.targ
-install: all $(ROOT64DYNLIB)
+install: all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64)