Merge changes from CUPS 1.4svn-r8606.

[thirdparty/cups.git] / scheduler / Makefile

diff --git a/scheduler/Makefile b/scheduler/Makefile
index 9479c7af561f9e19088475d77e757c39157b3326..2cbb74edc8d1b4969ec4289b59de0ac79f6f03c9 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -152,7 +152,8 @@ install-data:
                $(INSTALL_DIR) -m 755 $(STATEDIR); \
        fi
        echo Creating $(STATEDIR)/certs...
-       $(INSTALL_DIR) -m 511 -g $(CUPS_PRIMARY_SYSTEM_GROUP) $(STATEDIR)/certs
+       $(INSTALL_DIR) -m 511 -o $(CUPS_USER) -g $(CUPS_PRIMARY_SYSTEM_GROUP) \
+               $(STATEDIR)/certs
        echo Creating $(LOGDIR)...
        $(INSTALL_DIR) -m 755 $(LOGDIR)
        echo Creating $(REQUESTS)...
@@ -276,6 +277,8 @@ apihelp:
                --css ../doc/cups-printable.css \
                --header api-mime.header --intro api-mime.shtml \
                mime.h $(LIBOBJS:.o=.c) >../doc/help/api-mime.html
+       mxmldoc --tokens help/api-mime.html api-mime.xml >../doc/help/api-mime.tokens
+       $(RM) api-mime.xml
 
 framedhelp:
        mxmldoc --framed api-mime \