Merge changes from CUPS 1.5svn-r9400

[thirdparty/cups.git] / Makefile

diff --git a/Makefile b/Makefile
index 82c29d66ce315dadc9bd3e4bdf1fafc1c19d5fcd..3babe2cc3cac203198a4cf516a384619c87374f0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,21 +16,11 @@
 include Makedefs
 
 
-#
-# Don't run top-level build targets in parallel...
-#
-
-.NOTPARALLEL:
-
-
 #
 # Directories to make...
 #
 
-DIRS   =       cups filter backend berkeley cgi-bin driver locale man monitor \
-               notifier ppdc scheduler systemv test \
-               $(PHPDIR) \
-               conf data desktop doc examples $(FONTS) templates
+DIRS   =       cups test $(BUILDDIRS) $(PHPDIR) $(FONTS)
 
 
 #
@@ -119,7 +109,7 @@ distclean:  clean
        $(RM) packaging/cups-desc.plist packaging/cups-info.plist
        $(RM) templates/header.tmpl
        $(RM) desktop/cups.desktop
-       $(RM) scheduler/cups.sh scheduler/cups-lpd
+       $(RM) scheduler/cups.sh scheduler/cups-lpd.xinetd
        $(RM) scheduler/org.cups.cups-lpd.plist scheduler/cups.xml
        -$(RM) doc/*/index.html
        -$(RM) templates/*/header.tmpl
@@ -170,6 +160,8 @@ install:    install-data install-headers install-libs install-exec
 #
 
 install-data:
+       echo Making all in cups...
+       (cd cups; $(MAKE) $(MFLAGS) all)
        for dir in $(DIRS); do\
                echo Installing data files in $$dir... ;\
                (cd $$dir; $(MAKE) $(MFLAGS) install-data) || exit 1;\
@@ -188,6 +180,11 @@ install-headers:
                echo Installing header files in $$dir... ;\
                (cd $$dir; $(MAKE) $(MFLAGS) install-headers) || exit 1;\
        done
+       if test "x$(privateinclude)" != x; then \
+               echo Installing config.h into $(PRIVATEINCLUDE)...; \
+               $(INSTALL_DIR) -m 755 $(PRIVATEINCLUDE); \
+               $(INSTALL_DATA) config.h $(PRIVATEINCLUDE)/config.h; \
+       fi
 
 
 #