From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 8 Jan 2011 14:16:03 +0000 (+0100)
Subject: passwd: Clean up NM add popt-devel as dependency.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03a8a0399d9c60e04a44306e0c040b0124025985;p=ipfire-3.x.git

passwd: Clean up NM add popt-devel as dependency.
---

diff --git a/pkgs/core/passwd/passwd.nm b/pkgs/core/passwd/passwd.nm
index a6a29194e..a59d82ec5 100644
--- a/pkgs/core/passwd/passwd.nm
+++ b/pkgs/core/passwd/passwd.nm
@@ -35,7 +35,7 @@ PKG_LICENSE    = BSD
 PKG_SUMMARY    = An utility for setting or changing passwords using PAM.
 
 PKG_BUILD_DEPS+= audit-devel glib2-devel libuser-devel pam-devel pkg-config \
-	libselinux-devel
+	libselinux-devel popt-devel
 
 define PKG_DESCRIPTION
 	This package contains a system utility (passwd) which sets \
@@ -45,13 +45,9 @@ endef
 
 PKG_TARBALL    = $(THISAPP).tar.bz2
 
-define STAGE_BUILD
-	cd $(DIR_APP) && \
-		./configure \
-			--prefix=/usr \
-			--with-selinux \
-			--with-audit \
-			--disable-static
+CONFIGURE_OPTIONS +=\
+	--with-selinux \
+	--with-audit \
+	--disable-static
 
-	cd $(DIR_APP) && make DEBUG= RPM_OPT_FLAGS="$(CFLAGS)" $(PARALLELISMFLAGS)
-endef
+STAGE_BUILD_TARGETS = DEBUG= RPM_OPT_FLAGS="$(CFLAGS)"