Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Dec 2006 18:40:32 GMT
From:      Todd Miller <millert@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 111050 for review
Message-ID:  <200612041840.kB4IeWSB090790@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=111050

Change 111050 by millert@millert_g5tower on 2006/12/04 18:39:31

	Install man pages and man page links.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/Makefile#5 edit
.. //depot/projects/trustedbsd/sedarwin8/darwin/libmac/Makefile#4 edit
.. //depot/projects/trustedbsd/sedarwin8/release/Makefile#4 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/Makefile#5 (text+ko) ====

@@ -9,7 +9,7 @@
 	$(MAKE) -C kext_tools
 	$(MAKE) -C $(XNU)
 	$(MAKE) -C bootstrap_cmds
-	$(MAKE) -C libmac
+	bsdmake -C libmac
 	$(MAKE) -C mac_cmds
 	$(MAKE) -C adv_cmds/ps.tproj all
 	$(MAKE) -C file_cmds/ls all
@@ -28,7 +28,7 @@
 		$(DESTDIR)/$(SYSTEM_PLUGINS)/
 	install -m 644 $(XNU)/BUILD/dst/mach_kernel $(DESTDIR)/
 	tar -C $(XNU)/BUILD/dst -cf - usr/include | tar -C $(DESTDIR) -xf -
-	$(MAKE) -C libmac install
+	bsdmake -C libmac install
 	$(MAKE) -C mac_cmds install
 	$(MAKE) -C osx_cmds install
 	$(MAKE) -C adv_cmds/ps.tproj DSTROOT=$(DESTDIR) install
@@ -47,7 +47,7 @@
 	$(MAKE) -C bootstrap_cmds clean
 	$(MAKE) -C cctools clean
 	$(MAKE) -C kext_tools clean
-	$(MAKE) -C libmac clean
+	bsdmake -C libmac clean
 	$(MAKE) -C mac_cmds clean
 	$(MAKE) -C osx_cmds clean
 	$(MAKE) -C adv_cmds/ps.tproj clean

==== //depot/projects/trustedbsd/sedarwin8/darwin/libmac/Makefile#4 (text+ko) ====

@@ -1,30 +1,36 @@
 include ../../Makeconfig
 
-MIGSOURCE= $(DARWIN)/BUILD/obj/EXPORT_HDRS/osfmk/mach/
-
+MIGSOURCE=	$(DARWIN)/BUILD/obj/EXPORT_HDRS/osfmk/mach
 CFLAGS+=	$(DARWIN_HDRS) # -I$(MIGSOURCE)
 
-LIB= mac
-OBJS = mac.o mac_exec.o mac_get.o mac_set.o mac_mount.o security.o \
-	mac_getmntinfo.o
-AR = ar cq
-RANLIB = ranlib
-INSTALL = install
+LIB=		mac
+SRCS=		mac.c mac_exec.c mac_get.c mac_getmntinfo.c mac_mount.c \
+		mac_set.c security.c
+MAN=		mac.3 mac.conf.5 mac_free.3 mac_get.3 mac_is_present.3 \
+		mac_prepare.3 mac_set.3 mac_text.3 maclabel.7
+MLINKS=		mac_get.3 mac_get_fd.3 				\
+		mac_get.3 mac_get_file.3			\
+		mac_get.3 mac_get_link.3			\
+		mac_get.3 mac_get_lcid.3			\
+		mac_get.3 mac_get_lctx.3			\
+		mac_get.3 mac_get_mount.3			\
+		mac_get.3 mac_get_pid.3				\
+		mac_get.3 mac_get_proc.3			\
+		mac_prepare.3 mac_prepare_file_label.3		\
+		mac_prepare.3 mac_prepare_ifnet_label.3		\
+		mac_prepare.3 mac_prepare_process_label.3	\
+		mac_set.3 mac_set_link.3			\
+		mac_set.3 mac_set_fd.3				\
+		mac_set.3 mac_set_file.3			\
+		mac_set.3 mac_set_lctx.3			\
+		mac_set.3 mac_set_proc.3			\
+		mac_text.3 mac_from_text.3			\
+		mac_text.3 mac_to_text.3			\
 
-all: lib$(LIB).a
+NOPROFILE=
+CLEANFILES+=	security.c security.h
 
-install: all
-	$(INSTALL) -o $(LIBOWN) -g $(LIBGRP) -m 0644 lib$(LIB).a \
-		$(DESTDIR)/usr/lib
-	$(RANLIB) $(DESTDIR)/usr/lib/lib$(LIB).a
-
-clean:
-	rm -f lib$(LIB).a $(OBJS) security.c security.h
-
-lib$(LIB).a:: $(OBJS)
-	rm -f lib$(LIB).a
-	$(AR) lib$(LIB).a `lorder $(OBJS) | tsort -q`
-	$(RANLIB) lib$(LIB).a
-
 security.c: $(MIGSOURCE)/security.defs
 	mig $(CFLAGS) -user $@ -header security.h -server /dev/null -sheader /dev/null $(MIGSOURCE)/security.defs
+
+.include <bsd.lib.mk>

==== //depot/projects/trustedbsd/sedarwin8/release/Makefile#4 (text+ko) ====

@@ -5,7 +5,10 @@
 	$(DESTDIR)/usr/bin \
 	$(DESTDIR)/usr/lib \
 	$(DESTDIR)/usr/share/man/man1 \
+	$(DESTDIR)/usr/share/man/man3 \
 	$(DESTDIR)/usr/share/man/man4 \
+	$(DESTDIR)/usr/share/man/man5 \
+	$(DESTDIR)/usr/share/man/man7 \
 	$(DESTDIR)/usr/share/man/man8 \
 	$(DESTDIR)/System/Library/Extensions \
 	$(DESTDIR)/System/Library/Extensions/System.kext/PlugIns \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612041840.kB4IeWSB090790>