From d95bd167bc5f1e0eb6bb082d8b5a8e50602fd9a2 Mon Sep 17 00:00:00 2001 From: msweet Date: Thu, 31 Jul 2014 01:10:14 +0000 Subject: [PATCH] More cleanup. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12074 a1ca3aef-8c08-0410-bb20-df032aa958be --- Makefile | 20 ++++++++------------ packaging/cups.spec.in | 6 ++++-- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 4fbbb0578..0465d8a4a 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # # Top-level Makefile for CUPS. # -# Copyright 2007-2013 by Apple Inc. +# Copyright 2007-2014 by Apple Inc. # Copyright 1997-2007 by Easy Software Products, all rights reserved. # # These coded instructions, statements, and computer programs are the @@ -98,22 +98,18 @@ clean: distclean: clean $(RM) Makedefs config.h config.log config.status + $(RM) conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf $(RM) cups-config - $(RM) conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf - $(RM) doc/help/ref-cupsd-conf.html doc/help/standard.html doc/index.html - $(RM) man/client.conf.man - $(RM) man/cups-deviced.man man/cups-driverd.man - $(RM) man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man - $(RM) man/cupsd.conf.man man/drv.man man/lpoptions.man + $(RM) data/testprint + $(RM) desktop/cups.desktop + $(RM) doc/index.html + $(RM) man/client.conf.man man/cups-files.conf.man man/cups-lpd.man man/cups-snmp.man man/cupsaddsmb.man man/cupsd.conf.man man/cupsd.man man/lpoptions.man $(RM) packaging/cups.list - $(RM) packaging/cups-desc.plist packaging/cups-info.plist + $(RM) scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/org.cups.cupsd.path scheduler/org.cups.cupsd.service scheduler/org.cups.cupsd.socket $(RM) templates/header.tmpl - $(RM) desktop/cups.desktop - $(RM) scheduler/cups.sh scheduler/cups-lpd.xinetd - $(RM) scheduler/org.cups.cups-lpd.plist scheduler/cups.xml -$(RM) doc/*/index.html -$(RM) templates/*/header.tmpl - -$(RM) -r autom4te*.cache clang cups/charmaps cups/locale driver/test + -$(RM) -r autom4te*.cache clang cups/charmaps cups/locale # diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in index 5860951f1..bd9ac826f 100644 --- a/packaging/cups.spec.in +++ b/packaging/cups.spec.in @@ -311,6 +311,10 @@ rm -rf $RPM_BUILD_ROOT /usr/share/man/man5/mime.*.5.gz %dir /usr/share/man/man8 /usr/share/man/man8/accept.8.gz +/usr/share/man/man8/cups-deviced.8.gz +/usr/share/man/man8/cups-driverd.8.gz +/usr/share/man/man8/cups-exec.8.gz +/usr/share/man/man8/cups-snmp.8.gz /usr/share/man/man8/cupsaddsmb.8.gz /usr/share/man/man8/cupsaccept.8.gz /usr/share/man/man8/cupsctl.8.gz @@ -321,8 +325,6 @@ rm -rf $RPM_BUILD_ROOT /usr/share/man/man8/cupsdisable.8.gz /usr/share/man/man8/cupsenable.8.gz /usr/share/man/man8/cupsreject.8.gz -/usr/share/man/man8/cups-exec.8.gz -/usr/share/man/man8/cups-snmp.8.gz /usr/share/man/man8/lpadmin.8.gz /usr/share/man/man8/lpc.8.gz /usr/share/man/man8/lpinfo.8.gz -- 2.39.2