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

diff --git a/CHANGES.txt b/CHANGES.txt
index 75eaaee68ed5c52e566f049cae24ab6efd10871b..e57160005c74d0f200571794c1417406d83e9d07 100644 (file)
--- 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 eb136728aaa882f86d9ea8191cc7060f35264d94..1ebef2ed75801d8664c038fbe59fe0ad64cfbc72 100644 (file)
--- 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 f693fc4ec82ae4815d9a6aee36f62128fa807f4f..098029fff77ff509853923ab47a5896477c26129 100644 (file)
--- 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 3f707ae08fb09a2cb041c87a3171037068e7065d..8b21f993a272493564e04ba8c271d25200aa4692 100644 (file)
--- 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
 
 
 #