From e640c422750b9a61cf5512c44688b5bef3160f06 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Wed, 27 Sep 2006 12:30:27 +0000
Subject: [PATCH] - Removed a copyright from makefile. - Added ${.CURDIR} to
 .include "...". - Whitespace fixes.

OK'ed by:	piso
---
 lib/libalias/Makefile                 | 26 +-------------------------
 lib/libalias/libalias/Makefile        |  4 ++--
 lib/libalias/modules/Makefile         |  4 ++--
 lib/libalias/modules/Makefile.inc     |  4 ++--
 sys/modules/libalias/Makefile         |  2 +-
 sys/modules/libalias/modules/Makefile |  4 ++--
 6 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/lib/libalias/Makefile b/lib/libalias/Makefile
index 1b5ec952e2d5..e4296e1dfa15 100644
--- a/lib/libalias/Makefile
+++ b/lib/libalias/Makefile
@@ -1,29 +1,5 @@
-# Copyright 2006 Paolo Pisati <piso@FreeBSD.org>
-# 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.
-#
 # $FreeBSD$
 
-SUBDIR=        libalias modules
+SUBDIR=	libalias modules
 
 .include <bsd.subdir.mk>
diff --git a/lib/libalias/libalias/Makefile b/lib/libalias/libalias/Makefile
index 62907bb7ae3c..a8167037589c 100644
--- a/lib/libalias/libalias/Makefile
+++ b/lib/libalias/libalias/Makefile
@@ -4,10 +4,10 @@
 
 LIB=	alias
 SHLIBDIR?= /lib
-SHLIB_MAJOR=	5
+SHLIB_MAJOR= 5
 MAN=	libalias.3
 SRCS=	alias.c alias_db.c alias_proxy.c alias_util.c alias_old.c alias_mod.c
-INCS=   alias.h
+INCS=	alias.h
 WARNS?=	6
 NO_WERROR=
 
diff --git a/lib/libalias/modules/Makefile b/lib/libalias/modules/Makefile
index e4aa76724816..dc66ad23c2e5 100644
--- a/lib/libalias/modules/Makefile
+++ b/lib/libalias/modules/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-.include "../../../sys/modules/libalias/modules/modules.inc"
+.include "${.CURDIR}/../../../sys/modules/libalias/modules/modules.inc"
 
-SUBDIR= ${MODULES}
+SUBDIR=	${MODULES}
 
 .include <bsd.subdir.mk>
diff --git a/lib/libalias/modules/Makefile.inc b/lib/libalias/modules/Makefile.inc
index df92be4e5a39..a3c11c04e248 100644
--- a/lib/libalias/modules/Makefile.inc
+++ b/lib/libalias/modules/Makefile.inc
@@ -3,5 +3,5 @@
 .PATH: ${.CURDIR}/../../../../sys/netinet/libalias
 
 SHLIBDIR?= /lib
-SHLIB_MAJOR=	4
-WARNS?= 1
+SHLIB_MAJOR= 4
+WARNS?=	1
diff --git a/sys/modules/libalias/Makefile b/sys/modules/libalias/Makefile
index c8b7dd58e774..e4296e1dfa15 100644
--- a/sys/modules/libalias/Makefile
+++ b/sys/modules/libalias/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=        libalias modules
+SUBDIR=	libalias modules
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/libalias/modules/Makefile b/sys/modules/libalias/modules/Makefile
index 828e40faae78..201b3badf3b0 100644
--- a/sys/modules/libalias/modules/Makefile
+++ b/sys/modules/libalias/modules/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-.include "modules.inc"
+.include "${.CURDIR}/modules.inc"
 
-SUBDIR= ${MODULES}
+SUBDIR=	${MODULES}
 
 .include <bsd.subdir.mk>