From: Schantl Stefan <Stevee@ipfire.org>
Date: Tue, 23 Mar 2010 23:07:41 +0000 (+0100)
Subject: util-linux-ng: Clean up naoki-makefile.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4453cdaad686e814daee73e1bc76d73a4b5759c;p=ipfire-3.x.git

util-linux-ng: Clean up naoki-makefile.
---

diff --git a/pkgs/core/util-linux-ng/util-linux-ng.nm b/pkgs/core/util-linux-ng/util-linux-ng.nm
index 3ae52895f..bee8dd28f 100644
--- a/pkgs/core/util-linux-ng/util-linux-ng.nm
+++ b/pkgs/core/util-linux-ng/util-linux-ng.nm
@@ -48,40 +48,30 @@ PKG_TARBALL    = $(THISAPP).tar.bz2
 
 CFLAGS        += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 
-###############################################################################
-# Installation Details
-###############################################################################
+CONFIGURE_OPTIONS += \
+	--bindir=/bin \
+	--sbindir=/sbin \
+	--disable-wall \
+	--enable-arch \
+	--enable-kill \
+	--enable-login-utils \
+	--enable-partx \
+	--enable-write \
+	--disable-makeinstall-chown \
+	--disable-static
+	
 
 define STAGE_PREPARE_CMDS
 	cd $(DIR_APP) && sed -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
 		-i $$(grep -rl '/etc/adjtime' .)
 endef
 
-define STAGE_BUILD
-	cd $(DIR_APP) && \
-		./configure \
-			--prefix=/usr \
-			--bindir=/bin \
-			--sbindir=/sbin \
-			--disable-wall \
-			--enable-arch \
-			--enable-kill \
-			--enable-login-utils \
-			--enable-partx \
-			--enable-write \
-			--disable-makeinstall-chown \
-			--disable-static
-
-	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-
+define STAGE_BUILD_CMDS
 	# Build nologin
 	cd $(DIR_APP) && gcc $(CFLAGS) -o nologin $(DIR_SOURCE)/nologin.c
-
 endef
 
-define STAGE_INSTALL
-	cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
-
+define STAGE_INSTALL_CMDS
 	-mkdir -pv $(BUILDROOT)/sbin \
 		$(BUILDROOT)/var/lib/hwclock \
 		$(BUILDROOT)/usr/share/man/man8 \