Merge changes from CUPS 1.5svn-r9602.

[thirdparty/cups.git] / ppdc / Makefile

diff --git a/ppdc/Makefile b/ppdc/Makefile
index f58b6f88249e0f0d72c3045eae992995e25f8770..ea03fd581b47efed9e7d23d4bb47ca107ad8cacb 100644 (file)
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -3,7 +3,7 @@
 #
 #   Makefile for the CUPS PPD Compiler.
 #
-#   Copyright 2007-2010 by Apple Inc.
+#   Copyright 2007-2011 by Apple Inc.
 #   Copyright 2002-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -256,7 +256,7 @@ ppdc:                       ppdc.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
        $(CXX) $(LDFLAGS) -o $@ ppdc.o -L. -lcupsppdc $(LIBS)
 
 
-ppdc-static:           ppdc.o libcupsppdc.a  ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
+ppdc-static:           ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
        echo Linking $@...
        $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
@@ -294,7 +294,7 @@ ppdi-static:                ppdc-static ppdi.o libcupsppdc.a  ../cups/$(LIBCUPSSTATIC)
        ./ppdc-static -I ../data sample.drv
        ./ppdi-static -I ../data -o sample-import.drv ppd/*
        ./ppdc-static -I ../data -d ppd2 sample-import.drv
-       if diff -qr ppd ppd2; then \
+       if diff -r ppd ppd2 >/dev/null; then \
                echo PPD import OK; \
        else \
                echo PPD import FAILED; \