X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=doc%2FMakefile;h=5f2edc3002e26f05f0bc72dc22855c94bef5daca;hb=refs%2Fheads%2Fbranch-http2;hp=92a397f932f42603e1ca583291053fde13adbac0;hpb=58dc193312e27d25c0394e4fcb7a6eed7301b1ec;p=thirdparty%2Fcups.git

diff --git a/doc/Makefile b/doc/Makefile
index 92a397f93..5f2edc300 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,16 +1,16 @@
 #
-# "$Id: Makefile 7941 2008-09-16 00:46:13Z mike $"
+# "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $"
 #
-#   Documentation makefile for the Common UNIX Printing System (CUPS).
+# Documentation makefile for CUPS.
 #
-#   Copyright 2007-2008 by Apple Inc.
-#   Copyright 1997-2007 by Easy Software Products.
+# Copyright 2007-2014 by Apple Inc.
+# Copyright 1997-2007 by Easy Software Products.
 #
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs
@@ -20,96 +20,109 @@ include ../Makedefs
 #
 
 WEBPAGES	=	\
+			apple-touch-icon.png \
 			cups.css \
 			cups-printable.css \
-			favicon.png \
 			index.html \
 			robots.txt
 WEBIMAGES	=	\
+			images/color-wheel.png \
 			images/cups.png \
-			images/cups.rgb \
-			images/cups-block-diagram.gif \
 			images/cups-icon.png \
+			images/generic.png \
 			images/left.gif \
-			images/raster.png \
 			images/right.gif \
 			images/sel.gif \
-			images/smiley.jpg \
 			images/unsel.gif \
 			images/wait.gif
+HELPIMAGES	=	\
+			images/cups-block-diagram.png \
+			images/cups-command-chain.png \
+			images/cups-postscript-chain.png \
+			images/cups-raster-chain.png \
+			images/raster.png \
+			images/raster-organization.png \
+			images/sample-image.png \
+			images/smiley.jpg
 HELPFILES	=	\
 			help/accounting.html \
 			help/api-array.html \
+			help/api-cgi.html \
 			help/api-cups.html \
+			help/api-driver.html \
 			help/api-filedir.html \
 			help/api-filter.html \
 			help/api-httpipp.html \
+			help/api-mime.html \
 			help/api-overview.html \
 			help/api-ppd.html \
+			help/api-ppdc.html \
 			help/api-raster.html \
 			help/cgi.html \
 			help/glossary.html \
 			help/kerberos.html \
 			help/license.html \
-			help/man-cupsaccept.html \
 			help/man-backend.html \
 			help/man-cancel.html \
 			help/man-classes.conf.html \
 			help/man-client.conf.html \
+			help/man-cups.html \
 			help/man-cups-config.html \
+			help/man-cups-files.conf.html \
 			help/man-cups-lpd.html \
-			help/man-cups-polld.html \
+			help/man-cups-snmp.html \
+			help/man-cupsaccept.html \
 			help/man-cupsaddsmb.html \
 			help/man-cupsd.conf.html \
 			help/man-cupsd.html \
+			help/man-cupsd-helper.html \
+			help/man-cupsd-logs.html \
 			help/man-cupsenable.html \
 			help/man-cupstestdsc.html \
 			help/man-cupstestppd.html \
-			help/man-drv.html \
 			help/man-filter.html \
+			help/man-ipptool.html \
+			help/man-ipptoolfile.html \
 			help/man-lp.html \
 			help/man-lpadmin.html \
 			help/man-lpc.html \
 			help/man-lpinfo.html \
 			help/man-lpmove.html \
 			help/man-lpoptions.html \
-			help/man-lppasswd.html \
 			help/man-lpq.html \
 			help/man-lpr.html \
 			help/man-lprm.html \
 			help/man-lpstat.html \
 			help/man-mime.convs.html \
 			help/man-mime.types.html \
+			help/man-notifier.html \
+			help/man-ppdc.html \
+			help/man-ppdhtml.html \
+			help/man-ppdi.html \
+			help/man-ppdmerge.html \
+			help/man-ppdpo.html \
 			help/man-printers.conf.html \
+			help/man-subscriptions.conf.html \
 			help/network.html \
 			help/options.html \
 			help/overview.html \
 			help/policies.html \
-			help/ref-access_log.html \
-			help/ref-classes-conf.html \
-			help/ref-client-conf.html \
-			help/ref-cupsd-conf.html \
-			help/ref-error_log.html \
-			help/ref-mailto-conf.html \
-			help/ref-page_log.html \
+			help/postscript-driver.html \
+			help/ppd-compiler.html \
+			help/raster-driver.html \
 			help/ref-ppdcfile.html \
-			help/ref-printers-conf.html \
-			help/ref-snmp-conf.html \
-			help/ref-subscriptions-conf.html \
 			help/security.html \
+			help/sharing.html \
 			help/spec-banner.html \
-			help/spec-browsing.html \
-			help/spec-cmp.html \
 			help/spec-command.html \
 			help/spec-design.html \
 			help/spec-ipp.html \
+			help/spec-pdf.html \
 			help/spec-postscript.html \
 			help/spec-ppd.html \
 			help/spec-raster.html \
 			help/spec-stp.html \
-			help/standard.html \
-			help/translation.html \
-			help/whatsnew.html
+			help/translation.html
 
 
 #
@@ -158,7 +171,7 @@ install:	all install-data install-headers install-libs install-exec
 # Install data files...
 #
 
-install-data:
+install-data: $(INSTALL_LANGUAGES)
 	$(INSTALL_DIR) -m 755 $(DOCDIR)
 	for file in $(WEBPAGES); do \
 		$(INSTALL_MAN) $$file $(DOCDIR); \
@@ -168,23 +181,21 @@ install-data:
 		$(INSTALL_MAN) $$file $(DOCDIR)/help; \
 	done
 	$(INSTALL_DIR) -m 755 $(DOCDIR)/images
-	for file in $(WEBIMAGES); do \
+	for file in $(WEBIMAGES) $(HELPIMAGES); do \
 		$(INSTALL_MAN) $$file $(DOCDIR)/images; \
 	done
 
 install-languages:
 	for lang in $(LANGUAGES); do \
 		if test -d $$lang; then \
-			$(INSTALL_DIR) -m 755 $(DOCDIR)/$$lang/images; \
-			$(INSTALL_MAN) $$lang/index.html $(DOCDIR)/$$lang; \
-			$(INSTALL_MAN) $$lang/cups.css $(DOCDIR)/$$lang 2>/dev/null || true; \
-			$(INSTALL_DIR) -m 755 $(DOCDIR)/$$lang/images; \
-			for file in $(WEBIMAGES); do \
-				$(INSTALL_MAN) $$lang/$$file $(DOCDIR)/$$lang/images 2>/dev/null || true; \
-			done; \
+			$(INSTALL_DIR) -m 755 $(DOCDIR)/$$lang; \
+			$(INSTALL_DATA) $$lang/index.html $(DOCDIR)/$$lang; \
+			$(INSTALL_DATA) $$lang/cups.css $(DOCDIR)/$$lang >/dev/null 2>&1 || true; \
 		fi; \
 	done
 
+install-langbundle:
+
 
 #
 # Install programs...
@@ -208,7 +219,7 @@ install-libs:
 
 
 #
-# Unnstall all documentation files...
+# Uninstall all documentation files...
 #
 
 uninstall: $(UNINSTALL_LANGUAGES)
@@ -229,13 +240,21 @@ uninstall-languages:
 	-for lang in $(LANGUAGES); do \
 		$(RM) $(DOCDIR)/$$lang/index.html; \
 		$(RM) $(DOCDIR)/$$lang/cups.css; \
-		for file in $(WEBIMAGES); do \
-			$(RM) $(DOCDIR)/$$lang/$$file; \
-		done; \
-		$(RMDIR) $(DOCDIR)/$$lang/images; \
 		$(RMDIR) $(DOCDIR)/$$lang; \
 	done
 
+install-langbundle:
+
+
+#
+# Install the docset bits locally...
+#
+
+docset:
+	cp $(HELPFILES) ../org.cups.docset/Contents/Resources/Documentation/help
+	cp cups-printable.css ../org.cups.docset/Contents/Resources/Documentation
+	cp $(HELPIMAGES) ../org.cups.docset/Contents/Resources/Documentation/images
+
 
 #
 # End of Makefile.