Import changes from CUPS 1.4svn-r8704.

[thirdparty/cups.git] / Makedefs.in

diff --git a/Makedefs.in b/Makedefs.in
index 33270a4c3e1cfe3f27920c2fb5ebba8dd62d3eeb..e557871d2124b3da1f105b483500b80828069c86 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -3,7 +3,7 @@
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007-2009 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -20,6 +20,7 @@
 AR             =       @AR@
 AWK            =       @AWK@
 CC             =       @LIBTOOL@ @CC@
+CHMOD          =       @CHMOD@
 CXX            =       @LIBTOOL@ @CXX@
 DSO            =       @DSO@
 DSOXX          =       @DSOXX@
@@ -36,18 +37,17 @@ RMDIR               =       @RMDIR@
 SED            =       @SED@
 SHELL          =       /bin/sh
 
-
 #
 # Installation programs...
 #
 
-INSTALL_BIN    =       $(LIBTOOL) $(INSTALL) -m 755 @INSTALL_STRIP@
-INSTALL_CONFIG =       $(INSTALL) -m @CUPS_CONFIG_FILE_PERM@
-INSTALL_DATA   =       $(INSTALL) -m 644
+INSTALL_BIN    =       $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+INSTALL_CONFIG =       $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+INSTALL_DATA   =       $(INSTALL) -c -m 444
 INSTALL_DIR    =       $(INSTALL) -d
-INSTALL_LIB    =       $(LIBTOOL) $(INSTALL) -m 755 @INSTALL_STRIP@
-INSTALL_MAN    =       $(INSTALL) -m 644
-INSTALL_SCRIPT =       $(INSTALL) -m 755
+INSTALL_LIB    =       $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+INSTALL_MAN    =       $(INSTALL) -c -m 444
+INSTALL_SCRIPT =       $(INSTALL) -c -m 555
 
 #
 # Default user, group, and system groups for the scheduler...
@@ -122,6 +122,7 @@ ALL_CXXFLAGS        =       -I.. -D_CUPS_SOURCE $(CXXFLAGS) $(SSLFLAGS) \
 ARCHFLAGS      =       @ARCHFLAGS@
 ARFLAGS                =       @ARFLAGS@
 BACKLIBS       =       @BACKLIBS@
+BANNERTOPS     =       @BANNERTOPS@
 CFLAGS         =       @CPPFLAGS@ @CFLAGS@
 COMMONLIBS     =       @LIBS@
 CUPSDLIBS      =       @CUPSDLIBS@
@@ -137,12 +138,13 @@ FONTS             =       @FONTS@
 IMGLIBS                =       @IMGLIBS@
 IMGFILTERS     =       @IMGFILTERS@
 LAUNCHDLIBS    =       @LAUNCHDLIBS@
-LDFLAGS                =       -L../cups -L../filter @LDARCHFLAGS@ \
+LDFLAGS                =       -L../cgi-bin -L../cups -L../filter -L../ppdc \
+                       -L../scheduler @LDARCHFLAGS@ \
                        @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
 LEGACY_BACKENDS        =       @LEGACY_BACKENDS@
 LIBCUPSORDER   =       @LIBCUPSORDER@
 LIBCUPSIMAGEORDER =    @LIBCUPSIMAGEORDER@
-LINKCUPS       =       @LINKCUPS@ $(SSLLIBS)
+LINKCUPS       =       @LINKCUPS@ $(SSLLIBS) $(DNSSDLIBS)
 LINKCUPSIMAGE  =       @LINKCUPSIMAGE@
 LIBS           =       $(LINKCUPS) $(COMMONLIBS)
 OPTIM          =       @OPTIM@
@@ -154,6 +156,7 @@ PHPDIR              =       @PHPDIR@
 PHPOPTIONS     =       @PHPOPTIONS@ -I../.. `$(PHPCONFIG) --includes`
 SSLFLAGS       =       @SSLFLAGS@
 SSLLIBS                =       @SSLLIBS@
+TEXTTOPS       =       @TEXTTOPS@
 UNITTESTS      =       @UNITTESTS@