From: Michael R Sweet <msweet@msweet.org>
Date: Sun, 7 Mar 2021 19:49:38 +0000 (-0500)
Subject: Remove private include functionality (Issue #119)
X-Git-Tag: v2.4b1~199
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40ca30488883c4cd5869469873b9088631d5cd78;p=thirdparty%2Fcups.git

Remove private include functionality (Issue #119)
---

diff --git a/Makedefs.in b/Makedefs.in
index b4ceff0572..2bf60cfb03 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,6 +1,7 @@
 #
 # Common makefile definitions for CUPS.
 #
+# Copyright © 2021 by OpenPrinting.
 # Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2007 by Easy Software Products, all rights reserved.
 #
@@ -215,7 +216,6 @@ localstatedir	=	@localstatedir@
 mandir		=	@mandir@
 oldincludedir	=	@oldincludedir@
 prefix		=	@prefix@
-privateinclude	=	@privateinclude@
 sbindir		=	@sbindir@
 sharedstatedir	=	@sharedstatedir@
 srcdir		=	@srcdir@
@@ -236,7 +236,6 @@ LOCALEDIR	= 	$(BUILDROOT)@CUPS_LOCALEDIR@
 LOGDIR		= 	$(BUILDROOT)@CUPS_LOGDIR@
 MANDIR		=	$(BUILDROOT)@mandir@
 MENUDIR		=	@MENUDIR@
-PRIVATEINCLUDE	=	$(BUILDROOT)@PRIVATEINCLUDE@
 RCLEVELS	=	@RCLEVELS@
 RCSTART		=	@RCSTART@
 RCSTOP		=	@RCSTOP@
diff --git a/cups/Makefile b/cups/Makefile
index a49747e261..43b2335347 100644
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,6 +1,7 @@
 #
 # Library Makefile for CUPS.
 #
+# Copyright © 2021 by OpenPrinting.
 # Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2006 by Easy Software Products, all rights reserved.
 #
@@ -277,13 +278,6 @@ install-headers:
 	for file in $(HEADERS); do \
 		$(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
 	done
-	if test "x$(privateinclude)" != x; then \
-		echo Installing private header files into $(PRIVATEINCLUDE)...; \
-		$(INSTALL_DIR) -m 755 $(PRIVATEINCLUDE); \
-		for file in $(HEADERSPRIV); do \
-			$(INSTALL_DATA) $$file $(PRIVATEINCLUDE)/$$file; \
-		done; \
-	fi
 
 
 #
@@ -353,12 +347,6 @@ uninstall:
 		$(RM) $(INCLUDEDIR)/cups/$$file; \
 	done
 	-$(RMDIR) $(INCLUDEDIR)/cups
-	if test "x$(privateinclude)" != x; then \
-		for file in $(HEADERSPRIV); do \
-			$(RM) $(PRIVATEINCLUDE)/cups/$$file; \
-		done
-		$(RMDIR) $(PRIVATEINCLUDE)/cups; \
-	fi
 
 
 #