]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
cups: Fix installation of files.
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 6 Sep 2009 19:16:02 +0000 (21:16 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 6 Sep 2009 19:16:02 +0000 (21:16 +0200)
/usr/var -> /var.
Sysvinit scripts deleted.

lfs/cups

index 346a2ebffff2d531d1917f913550377a67bdb1a7..082e4c9424f83fa95084d29b3aa433d3fc20ae6c 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -40,10 +40,10 @@ CORE       = no
 EXTRA      = yes
 DEBUG      = no
 BUILD_DEPS = 
-DEPS       = cyrus-sasl ghostscript
+DEPS       = cyrus-sasl ghostscript libjpeg libtiff openldap
 
 URL        = http://cups.org/software.php
-LICENSE    = GPL2+
+LICENSE    = GPLv2+
 SHORT_DESC = The common UNIX printing system.
 
 define LONG_DESC
@@ -84,12 +84,15 @@ $(OBJECT): $(objects)
                        $(CONFIGURE_ARCH) \
                        --prefix=/usr \
                        --sysconfdir=/etc \
-                       --disable-static \
-                       --disable-nls
+                       --localstatedir=/var \
+                       --disable-static
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install
 
+       # Remove sysvinit scripts
+       rm -vf /etc/init.d/cups /etc/rc*.d
+
        cp -fv $(DIR_SRC)/$(THISAPP)/conf/cupsd.conf /etc/cups/
 
        @rm -rf $(DIR_APP)