summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2010-03-24 14:32:08 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2010-03-24 14:32:08 +0000
commit71e160228f56370c40a47637d85d07c230052e86 (patch)
tree00d1c9b78a365ca7518f7bba195275135e6e3430 /Makefile
parent54afec335014303dba3c6eabe5393adce9e660ad (diff)
downloadcups-71e160228f56370c40a47637d85d07c230052e86.tar.gz
Merge changes from CUPS 1.5svn-r9049 (private header support)
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1992 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 82c29d66c..d215c47f4 100644
--- a/Makefile
+++ b/Makefile
@@ -119,7 +119,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
@@ -188,6 +188,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)...; \
+ $(INSTALLDIR) -m 755 $(PRIVATEINCLUDE); \
+ $(INSTALL_DATA) config.h $(PRIVATEINCLUDE); \
+ fi
#