Hinzugefügt:

[ipfire-2.x.git] / lfs / cups

diff --git a/lfs/cups b/lfs/cups
index 7cd0822467fc969725f1da100ed9d02bfe2f7779..eea9f8d5cb270f9fd65912869f6dca79aa5944c5 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 1.1.23
 
 THISAPP    = cups-$(VER)-source
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = ftp://ftp.easysw.com/pub/cups/$(VER)
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -83,9 +77,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && sed -i -e "s@pam/pam@security/pam@g" {config-scripts/cups-pam.m4,scheduler/auth.c,configure}
 #      cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/patches/cups-1.1.23-testsuite_fix-1.patch
-       cd $(DIR_APP) && ./configure --disable-nls
+       cd $(DIR_APP) && ./configure --disable-nls --sysconfdir=/var/ipfire
        cd $(DIR_APP) && make
 #      cd $(DIR_APP) && make check
        cd $(DIR_APP) && make install
+       cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)