From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 12 Apr 2016 10:52:27 +0000 (-0400)
Subject: Move CGI, PPD compiler, and MIME heades to the private headers directory.
X-Git-Tag: v2.2b1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27453efb8716d3d28f2d79ab0895eae484868168;p=thirdparty%2Fcups.git

Move CGI, PPD compiler, and MIME heades to the private headers directory.
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 75eaaee68e..e57160005c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 2.2b1 - 2016-04-04
+CHANGES.txt - 2.2b1 - 2016-04-12
 --------------------------------
 
 CHANGES IN CUPS V2.2b1
diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index eb136728aa..1ebef2ed75 100644
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -1,7 +1,7 @@
 #
 # CGI makefile for CUPS.
 #
-# Copyright 2007-2014 by Apple Inc.
+# Copyright 2007-2016 by Apple Inc.
 # Copyright 1997-2006 by Easy Software Products.
 #
 # These coded instructions, statements, and computer programs are the
@@ -126,10 +126,13 @@ install-exec:
 #
 
 install-headers:
-	echo Installing header files in $(INCLUDEDIR)/cups...
-	$(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
-	$(INSTALL_DATA) cgi.h $(INCLUDEDIR)/cups
-	$(INSTALL_DATA) help-index.h $(INCLUDEDIR)/cups
+	if test "x$(privateinclude)" != x; then \
+		echo Installing private header files into $(PRIVATEINCLUDE)...; \
+		$(INSTALL_DIR) -m 755 $(PRIVATEINCLUDE); \
+		for file in cgi.h help-index.h; do \
+			$(INSTALL_DATA) $$file $(PRIVATEINCLUDE); \
+		done; \
+	fi
 
 
 #
diff --git a/ppdc/Makefile b/ppdc/Makefile
index f693fc4ec8..098029fff7 100644
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the CUPS PPD Compiler.
 #
-# Copyright 2007-2015 by Apple Inc.
+# Copyright 2007-2016 by Apple Inc.
 # Copyright 2002-2006 by Easy Software Products.
 #
 # These coded instructions, statements, and computer programs are the
@@ -153,9 +153,11 @@ install-exec:
 #
 
 install-headers:
-	echo Installing header files in $(INCLUDEDIR)/cups...
-	$(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
-	$(INSTALL_DATA) ppdc.h $(INCLUDEDIR)/cups
+	if test "x$(privateinclude)" != x; then \
+		echo Installing private header files into $(PRIVATEINCLUDE)...; \
+		$(INSTALL_DIR) -m 755 $(PRIVATEINCLUDE); \
+		$(INSTALL_DATA) ppdc.h $(PRIVATEINCLUDE); \
+	fi
 
 
 #
diff --git a/scheduler/Makefile b/scheduler/Makefile
index 3f707ae08f..8b21f993a2 100644
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -1,7 +1,7 @@
 #
 # Scheduler Makefile for CUPS.
 #
-# Copyright 2007-2015 by Apple Inc.
+# Copyright 2007-2016 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 # These coded instructions, statements, and computer programs are the
@@ -241,9 +241,11 @@ install-exec:
 #
 
 install-headers:
-	echo Installing header files in $(INCLUDEDIR)/cups...
-	$(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
-	$(INSTALL_DATA) mime.h $(INCLUDEDIR)/cups
+	if test "x$(privateinclude)" != x; then \
+		echo Installing private header files into $(PRIVATEINCLUDE)...; \
+		$(INSTALL_DIR) -m 755 $(PRIVATEINCLUDE); \
+		$(INSTALL_DATA) mime.h $(PRIVATEINCLUDE); \
+	fi
 
 
 #