Merge changes from CUPS 1.5svn-r8842.

[thirdparty/cups.git] / Makefile

diff --git a/Makefile b/Makefile
index 0fedbbdb4c0e1cd6f3750c62367ea97bae45f9d1..586c9e6cd48196a53447bf600015919e688f5fb8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -392,6 +392,7 @@ docset:     apihelp
        echo Indexing docset...
        /Developer/usr/bin/docsetutil index org.cups.docset
        echo Generating docset archive and feed...
+       $(RM) org.cups.docset.atom
        /Developer/usr/bin/docsetutil package --output org.cups.docset.xar \
                --atom org.cups.docset.atom \
                --download-url http://www.cups.org/org.cups.docset.xar \
@@ -424,7 +425,7 @@ dist:       all
                *BSD*) $(MAKE) $(MFLAGS) bsd;; \
                Darwin*) $(MAKE) $(MFLAGS) osx;; \
                IRIX*) $(MAKE) $(MFLAGS) tardist;; \
-               Linux*) $(MAKE) $(MFLAGS) rpm;; \
+               Linux*) test ! -x /usr/bin/rpm || $(MAKE) $(MFLAGS) rpm;; \
                SunOS*) $(MAKE) $(MFLAGS) pkg;; \
        esac