From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 17 Feb 2010 21:15:38 +0000 (+0100)
Subject: cups: Cleanup makefile.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a873f0b3512b1f0d673e5d5ea72f166f44795af3;p=ipfire-3.x.git

cups: Cleanup makefile.

Add dependencies.
Fix installation of files.
---

diff --git a/pkgs/core/cups/cups.nm b/pkgs/core/cups/cups.nm
index f8ac693e7..54c0b9357 100644
--- a/pkgs/core/cups/cups.nm
+++ b/pkgs/core/cups/cups.nm
@@ -34,7 +34,7 @@ PKG_URL        = http://cups.org/software.php
 PKG_LICENSE    = GPLv2+
 PKG_SUMMARY    = The common UNIX printing system.
 
-PKG_DEPS      += cyrus-sasl ghostscript libjpeg libtiff openldap
+PKG_DEPS      += cyrus-sasl ghostscript libjpeg libpng libtiff openldap pam perl python zlib
 
 define PKG_DESCRIPTION
 	CUPS is the standards-based, open source printing system developed \
@@ -44,15 +44,15 @@ endef
 PKG_TARBALL    = $(THISAPP)-source.tar.bz2
 
 CONFIGURE_OPTIONS += \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static
+	--sysconfdir=/etc \
+	--localstatedir=/var
+
+define STAGE_INSTALL
+	cd $(DIR_APP) && make install BUILDROOT=$(BUILDROOT)
 
-define STAGE_INSTALL_CMDS
 	# Remove sysvinit scripts
 	rm -vfr $(BUILDROOT)/etc/init.d/cups $(BUILDROOT)/etc/rc*.d
 
 	-mkdir -pv $(BUILDROOT)/etc/cups
 	cp -vf $(DIR_APP)/conf/cupsd.conf $(BUILDROOT)/etc/cups/
 endef
-