Merge changes from CUPS 1.4svn-r8628.

[thirdparty/cups.git] / man / Makefile

diff --git a/man/Makefile b/man/Makefile
index 1e2bb0100526956b9531fb1965590bd69cb609a9..b12c39a659ac37bbdae0963e7fd3e6718321489e 100644 (file)
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7601 2008-05-20 21:08:08Z mike $"
+# "$Id: Makefile 7930 2008-09-10 22:25:54Z mike $"
 #
 #   Man page makefile for the Common UNIX Printing System (CUPS).
 #
@@ -47,13 +47,10 @@ MAN5        =       classes.conf.$(MAN5EXT) \
                printers.conf.$(MAN5EXT) \
                subscriptions.conf.$(MAN5EXT)
 MAN7   =       backend.$(MAN7EXT) \
-               commandtoescpx.$(MAN7EXT) \
-               commandtopclx.$(MAN7EXT) \
                drv.$(MAN7EXT) \
                filter.$(MAN7EXT) \
-               rastertoescpx.$(MAN7EXT) \
-               rastertopclx.$(MAN7EXT)
-MAN8   =       accept.$(MAN8EXT) \
+               notifier.$(MAN7EXT)
+MAN8   =       cupsaccept.$(MAN8EXT) \
                cupsaddsmb.$(MAN8EXT) \
                cupsctl.$(MAN8EXT) \
                cupsfilter.$(MAN8EXT) \
@@ -129,7 +126,7 @@ install:    all install-data install-headers install-libs install-exec
 # Install data files...
 #
 
-install-data:
+install-data: all
        $(INSTALL_DIR) -m 755 $(MANDIR)/man1
        for file in $(MAN1); do \
                echo Installing $$file in $(MANDIR)/man1...; \
@@ -150,8 +147,10 @@ install-data:
                echo Installing $$file in $(AMANDIR)/man$(MAN8DIR)...; \
                $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8DIR); \
        done
-       $(RM) $(AMANDIR)/man$(MAN8DIR)/reject.$(MAN8EXT)
-       $(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/reject.$(MAN8EXT)
+       for file in accept cupsreject reject; do \
+               $(RM) $(AMANDIR)/man$(MAN8DIR)/$$file.$(MAN8EXT); \
+               $(LN) cupsaccept.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/$$file.$(MAN8EXT); \
+       done
        $(RM) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT)
        $(LN) cupsenable.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT)
 
@@ -197,6 +196,8 @@ uninstall:
        for file in $(MAN8); do \
                $(RM) $(AMANDIR)/man$(MAN8DIR)/$$file; \
        done
+       $(RM) $(AMANDIR)/man$(MAN8DIR)/accept.$(MAN8EXT)
+       $(RM) $(AMANDIR)/man$(MAN8DIR)/cupsreject.$(MAN8EXT)
        $(RM) $(AMANDIR)/man$(MAN8DIR)/reject.$(MAN8EXT)
        $(RM) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT)
        -$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
@@ -230,5 +231,5 @@ mantohtml:  mantohtml.o
 
 
 #
-# End of "$Id: Makefile 7601 2008-05-20 21:08:08Z mike $".
+# End of "$Id: Makefile 7930 2008-09-10 22:25:54Z mike $".
 #