From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Tue, 20 Feb 2018 14:46:07 +0000 (-0500)
Subject: Fix installation of filters (Issue #5247)
X-Git-Tag: v2.3b4~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab89234de2d9bf36bb59f2aa4873d98e95ca4df2;p=thirdparty%2Fcups.git

Fix installation of filters (Issue #5247)
---

diff --git a/CHANGES.md b/CHANGES.md
index 3b38a42a82..d64f9ca22f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,12 @@
-CHANGES - 2.3b3 - 2018-02-01
+CHANGES - 2.3b4 - 2018-02-20
 ============================
 
+Changes in CUPS v2.3b4
+----------------------
+
+- Fixed installation of filters (Issue #5247)
+
+
 Changes in CUPS v2.3b3
 ----------------------
 
diff --git a/filter/Makefile b/filter/Makefile
index 4f67e20e9f..433a3ec021 100644
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,8 +1,8 @@
 #
 # Filter makefile for CUPS.
 #
-# Copyright 2007-2018 by Apple Inc.
-# Copyright 1997-2006 by Easy Software Products.
+# Copyright © 2007-2018 by Apple Inc.
+# Copyright © 1997-2006 by Easy Software Products.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
 # information.
@@ -36,14 +36,14 @@ all:	$(TARGETS)
 # Make library targets...
 #
 
-libs:		$(LIBTARGETS)
+libs:
 
 
 #
 # Make unit tests...
 #
 
-unittests:	$(UNITTARGETS)
+unittests:
 
 
 #
@@ -51,8 +51,7 @@ unittests:	$(UNITTARGETS)
 #
 
 clean:
-	$(RM) $(OBJS) $(TARGETS) $(UNITTARGETS)
-	$(RM) libcupsimage.so libcupsimage.sl libcupsimage.dylib
+	$(RM) $(OBJS) $(TARGETS)
 
 
 #
@@ -83,14 +82,12 @@ install-data:
 
 install-exec:
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/filter
-	for file in $(FILTERS); do \
+	for file in $(TARGETS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/filter; \
 	done
-	$(RM) $(SERVERBIN)/filter/rastertodymo
-	$(LN) rastertolabel $(SERVERBIN)/filter/rastertodymo
 	if test "x$(SYMROOT)" != "x"; then \
 		$(INSTALL_DIR) $(SYMROOT); \
-		for file in $(FILTERS); do \
+		for file in $(TARGETS); do \
 			cp $$file $(SYMROOT); \
 			dsymutil $(SYMROOT)/$$file; \
 		done \
@@ -116,10 +113,9 @@ install-libs:
 #
 
 uninstall:
-	for file in $(FILTERS); do \
+	for file in $(TARGETS); do \
 		$(RM) $(SERVERBIN)/filter/$$file; \
 	done
-	$(RM) $(SERVERBIN)/filter/rastertodymo
 	-$(RMDIR) $(SERVERBIN)/filter
 	-$(RMDIR) $(SERVERBIN)