summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2009-05-13 22:29:41 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2009-05-13 22:29:41 +0000
commit178cb7369d104b95acb92929f36956a38765c84c (patch)
tree4563f57a75df1c4145d25d3ebecf1d3152022362 /Makefile
parentf11a948a02771f78f50b530880a0269d4b4f58eb (diff)
downloadcups-178cb7369d104b95acb92929f36956a38765c84c.tar.gz
Merge changes from CUPS 1.4svn-r8628.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1495 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile33
1 files changed, 26 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 5a1f8b4a0..0fedbbdb4 100644
--- a/Makefile
+++ b/Makefile
@@ -316,17 +316,30 @@ uninstall:
fi \
$(RMDIR) $(BUILDROOT)$(INITDDIR); \
fi
+ if test "x$(SMFMANIFESTDIR)" != x; then \
+ echo Uninstalling SMF manifest in $(SMFMANIFESTDIR)...;\
+ $(RM) $(BUILDROOT)$(SMFMANIFESTDIR)/cups.xml; \
+ fi
if test "x$(DBUSDIR)" != x; then \
echo Uninstalling cups.conf in $(DBUSDIR)...;\
$(RM) $(BUILDROOT)$(DBUSDIR)/cups.conf; \
$(RMDIR) $(BUILDROOT)$(DBUSDIR); \
fi
- $(RM) $(BUILDROOT)/etc/xinetd.d/cups-lpd
- $(RM) $(BUILDROOT)/usr/share/applications/cups.desktop
- $(RM) $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps/cups.png
- $(RM) $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps/cups.png
- $(RM) $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps/cups.png
- $(RM) $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps/cups.png
+ if test "x$(XINETD)" != x; then \
+ echo Uninstalling xinetd configuration file for cups-lpd...; \
+ $(RM) $(BUILDROOT)$(XINETD)/cups-lpd; \
+ fi
+ if test "x$(MENUDIR)" != x; then \
+ echo Uninstalling desktop menu...; \
+ $(RM) $(BUILDROOT)$(MENUDIR)/cups.desktop; \
+ fi
+ if test "x$(ICONDIR)" != x; then \
+ echo Uninstalling desktop icons...; \
+ $(RM) $(BUILDROOT)$(ICONDIR)/hicolor/16x16/apps/cups.png; \
+ $(RM) $(BUILDROOT)$(ICONDIR)/hicolor/32x32/apps/cups.png; \
+ $(RM) $(BUILDROOT)$(ICONDIR)/hicolor/64x64/apps/cups.png; \
+ $(RM) $(BUILDROOT)$(ICONDIR)/hicolor/128x128/apps/cups.png; \
+ fi
#
@@ -344,7 +357,7 @@ check: all unittests
#
-# Create an Xcode docset...
+# Create HTML documentation...
#
apihelp:
@@ -359,11 +372,17 @@ framedhelp:
(cd $$dir; $(MAKE) $(MFLAGS) framedhelp) || exit 1;\
done
+
+#
+# Create an Xcode docset...
+#
+
docset: apihelp
echo Generating docset directory tree...
$(RM) -r org.cups.docset
mkdir -p org.cups.docset/Contents/Resources/Documentation/help
mkdir -p org.cups.docset/Contents/Resources/Documentation/images
+ cd man; $(MAKE) $(MFLAGS) html
cd doc; $(MAKE) $(MFLAGS) docset
cd cgi-bin; $(MAKE) $(MFLAGS) makedocset
cgi-bin/makedocset org.cups.docset \