Instead of a wrapper <linker_set.h>, use a symlink to

<sys/linker_set.h>.

Submitted by:	bde

2 files changed, 3 insertions, 37 deletions

diff --git a/include/Makefile b/include/Makefile
index fd91482..aa2e7cd 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-#	$Id: Makefile,v 1.89 1998/12/23 11:50:52 dfr Exp $
+#	$Id: Makefile,v 1.90 1999/01/14 05:53:54 jdp Exp $
 #
 # Doing a make install builds /usr/include
 #
@@ -11,7 +11,7 @@ SUBDIR= rpcsvc
 FILES=	a.out.h ar.h assert.h bitstring.h ctype.h db.h dirent.h disktab.h \
 	dlfcn.h elf.h err.h fnmatch.h fstab.h \
 	fts.h glob.h grp.h strhash.h histedit.h ieeefp.h iso646.h \
-	kvm.h limits.h link.h linker_set.h locale.h malloc.h memory.h mpool.h \
+	kvm.h limits.h link.h locale.h malloc.h memory.h mpool.h \
 	ndbm.h netdb.h nl_types.h nlist.h objformat.h \
 	paths.h pthread.h pthread_np.h pwd.h \
 	ranlib.h regex.h regexp.h resolv.h rune.h runetype.h setjmp.h sgtty.h \
@@ -36,7 +36,7 @@ MFILES=	float.h floatingpoint.h stdarg.h varargs.h
 PFILES=	mqueue.h sched.h semaphore.h \
 		# aio.h
 
-LFILES=	errno.h fcntl.h inttypes.h poll.h syslog.h termios.h
+LFILES=	errno.h fcntl.h inttypes.h linker_set.h poll.h syslog.h termios.h
 
 LDIRS=	cam msdosfs net netatalk netatm netinet netipx netkey netns nfs \
 	pccard posix4 sys vm
diff --git a/include/linker_set.h b/include/linker_set.h
deleted file mode 100644
index 3fa1e1d..0000000
--- a/include/linker_set.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * Copyright (c) 1999 John D. Polstra.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      $Id$
- */
-
-#ifndef	_LINKER_SET_H_
-#define	_LINKER_SET_H_
-
-#include <sys/linker_set.h>
-
-#endif /* !_LINKER_SET_H_ */