Normalize --help usage for cupsd (Issue #5326)

[thirdparty/cups.git] / cups / Makefile

diff --git a/cups/Makefile b/cups/Makefile
index 19c538e2e74223dcc93372d3daca70676caaf97b..b56e5f34a3fa88e38175b53e904f5358ab5b2190 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -290,7 +290,7 @@ install-libs: $(LIBTARGETS) $(INSTALLSTATIC)
                $(RM) $(LIBDIR)/libcups.dylib; \
                $(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
        fi
-       -if text "x$(LIBCUPSIMAGE)" != x; then
+       -if test "x$(LIBCUPSIMAGE)" != x; then \
                $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR); \
        fi
        -if test "x$(LIBCUPSIMAGE)" = "xlibcupsimage.so.2"; then \
@@ -305,10 +305,10 @@ install-libs: $(LIBTARGETS) $(INSTALLSTATIC)
                $(INSTALL_DIR) $(SYMROOT); \
                cp $(LIBCUPS) $(SYMROOT); \
                dsymutil $(SYMROOT)/$(LIBCUPS); \
-               if text "x$(LIBCUPSIMAGE)" != x; then \
+               if test "x$(LIBCUPSIMAGE)" != x; then \
                        cp $(LIBCUPSIMAGE) $(SYMROOT); \
                        dsymutil $(SYMROOT)/$(LIBCUPSIMAGE); \
-               fi \
+               fi; \
        fi
 
 installstatic:
@@ -355,7 +355,7 @@ uninstall:
 
 libcups.so.2:  $(LIBOBJS)
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) \
+       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(RM) `basename $@ .2`
        $(LN) $@ `basename $@ .2`
@@ -367,7 +367,7 @@ libcups.so.2:       $(LIBOBJS)
 
 libcups.2.dylib:       $(LIBOBJS)
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ \
+       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
                -install_name $(libdir)/$@ \
                -current_version 2.14.0 \
                -compatibility_version 2.0.0 \
@@ -384,8 +384,7 @@ libcups.2.dylib:    $(LIBOBJS)
 
 libcups.la:    $(LIBOBJS)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ \
-               $(LIBOBJS:.o=.lo) \
+       $(LD_CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) \
                -rpath $(LIBDIR) -version-info 2:14 $(LIBGSSAPI) $(SSLLIBS) \
                $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
@@ -424,8 +423,7 @@ libcups2.def: $(LIBOBJS) $(IMAGEOBJS) Makefile
 
 libcupsimage.so.2:     $(IMAGEOBJS) libcups.so.2
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) \
-               -L../cups $(LINKCUPS)
+       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) $(LINKCUPS)
        $(RM) `basename $@ .2`
        $(LN) $@ `basename $@ .2`
 
@@ -436,11 +434,11 @@ libcupsimage.so.2:        $(IMAGEOBJS) libcups.so.2
 
 libcupsimage.2.dylib:  $(IMAGEOBJS) libcups.2.dylib
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ \
+       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
                -install_name $(libdir)/$@ \
                -current_version 2.3.0 \
                -compatibility_version 2.0.0 \
-               $(IMAGEOBJS) $(DSOLIBS) -L../cups $(LINKCUPS)
+               $(IMAGEOBJS) $(DSOLIBS) $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        $(RM) libcupsimage.dylib
        $(LN) $@ libcupsimage.dylib
@@ -452,9 +450,8 @@ libcupsimage.2.dylib:       $(IMAGEOBJS) libcups.2.dylib
 
 libcupsimage.la:       $(IMAGEOBJS) libcups.la
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
-               -L../cups $(LINKCUPS) \
-               -rpath $(LIBDIR) -version-info 2:3
+       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
+               $(LINKCUPS) -rpath $(LIBDIR) -version-info 2:3
 
 
 #