diff --git a/XpConfig/C/print/Makefile.am b/XpConfig/C/print/Makefile.am
index 0191574f8..e3c01da60 100644
--- a/XpConfig/C/print/Makefile.am
+++ b/XpConfig/C/print/Makefile.am
@@ -10,3 +10,5 @@ Xprinters.ghostscript: $(srcdir)/Xprinters
 
 dist_xpc_DATA = Xprinters
 xpc_DATA = Xprinters.ghostscript
+
+CLEANFILES = Xprinters.ghostscript
diff --git a/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am b/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am
index 183cc92bb..ef0b3d106 100644
--- a/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am
+++ b/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am
@@ -1,6 +1,6 @@
-xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts
+xpcdir = @xpconfigdir@/C/print/models/CANONC3200-PS/fonts
 
-parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
+parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
 
 XPFONTS = \
         AvantGarde-Book.pmf \
@@ -34,18 +34,21 @@ XPFONTS = \
         Times-Roman.pmf \
         ZapfDingbats.pmf
 
-install-data-hook:
-	mkdir -p $(xpcdir) ;								\
-											\
-	for x in $(XPFONTS) ; do							\
-		rm -f $(xpcdir)/$$x	;						\
-		ln -s $(parentdir)/$$x $(xpcdir)/$$x	;				\
+dest = $(DESTDIR)$(xpcdir)
+
+remove-stuff:
+	for x in $(XPFONTS) ; do			\
+		rm -f $(dest)/$$x	;		\
 	done
 
-	@rm -f $(xpcdir)/fonts.scale
-	$(MKFONTSCALE) $(xpcdir)
-	@rm -f $(xpcdir)/font.dir
-	$(MKFONTDIR) $(xpcdir)
+	@rm -f $(dest)/fonts.dir
 
-distuninstallcheck:
-	@:
+install-data-hook: remove-stuff
+	mkdir -p $(dest) ;					\
+	for x in $(XPFONTS) ; do				\
+		ln -s $(parentdir)/$$x $(dest)/$$x	;	\
+	done
+
+	$(MKFONTSCALE) -b -s -l $(dest)
+
+uninstall-hook: remove-stuff
diff --git a/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am b/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am
index 183cc92bb..94395c954 100644
--- a/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am
+++ b/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am
@@ -1,6 +1,6 @@
-xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts
+xpcdir = @xpconfigdir@/C/print/models/HPLJ4050-PS/fonts
 
-parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
+parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
 
 XPFONTS = \
         AvantGarde-Book.pmf \
@@ -34,18 +34,21 @@ XPFONTS = \
         Times-Roman.pmf \
         ZapfDingbats.pmf
 
-install-data-hook:
-	mkdir -p $(xpcdir) ;								\
-											\
-	for x in $(XPFONTS) ; do							\
-		rm -f $(xpcdir)/$$x	;						\
-		ln -s $(parentdir)/$$x $(xpcdir)/$$x	;				\
+dest = $(DESTDIR)$(xpcdir)
+
+remove-stuff:
+	for x in $(XPFONTS) ; do			\
+		rm -f $(dest)/$$x	;		\
 	done
 
-	@rm -f $(xpcdir)/fonts.scale
-	$(MKFONTSCALE) $(xpcdir)
-	@rm -f $(xpcdir)/font.dir
-	$(MKFONTDIR) $(xpcdir)
+	@rm -f $(dest)/fonts.dir
 
-distuninstallcheck:
-	@:
+install-data-hook: remove-stuff
+	mkdir -p $(dest) ;					\
+	for x in $(XPFONTS) ; do				\
+		ln -s $(parentdir)/$$x $(dest)/$$x	;	\
+	done
+
+	$(MKFONTSCALE) -b -s -l $(dest)
+
+uninstall-hook: remove-stuff
diff --git a/XpConfig/C/print/models/Makefile.am b/XpConfig/C/print/models/Makefile.am
index 0f1415c57..488a06a75 100644
--- a/XpConfig/C/print/models/Makefile.am
+++ b/XpConfig/C/print/models/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = \
+	PSdefault		\
 	CANONBJ10E-GS		\
 	CANONC3200-PS		\
 	GSdefault		\
@@ -6,6 +7,5 @@ SUBDIRS = \
 	HPLJ4050-PS		\
 	HPLJ4family		\
 	PS2PDFspooldir-GS	\
-	PSdefault		\
 	PSspooldir		\
 	SPSPARC2
diff --git a/XpConfig/C/print/models/PSdefault/Makefile.am b/XpConfig/C/print/models/PSdefault/Makefile.am
index 46a7d7f2e..040f26077 100644
--- a/XpConfig/C/print/models/PSdefault/Makefile.am
+++ b/XpConfig/C/print/models/PSdefault/Makefile.am
@@ -3,12 +3,3 @@ SUBDIRS = fonts
 xpcdir = @xpconfigdir@/C/print/models/PSdefault
 
 dist_xpc_DATA = model-config
-
-install-data-hook:
-	@rm -f $(xpcdir)/fonts.scale
-	$(MKFONTSCALE) $(xpcdir)
-	@rm -f $(xpcdir)/font.dir
-	$(MKFONTDIR) $(xpcdir)
-
-distuninstallcheck:
-	@:
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Makefile.am b/XpConfig/C/print/models/PSdefault/fonts/Makefile.am
index cde158e73..7cdfd8ee9 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Makefile.am
+++ b/XpConfig/C/print/models/PSdefault/fonts/Makefile.am
@@ -32,11 +32,13 @@ dist_xpc_DATA =				\
 	Times-Roman.pmf			\
 	ZapfDingbats.pmf
 
-install-data-hook:
-	@rm -f $(xpcdir)/fonts.scale
-	$(MKFONTSCALE) $(xpcdir)
-	@rm -f $(xpcdir)/font.dir
-	$(MKFONTDIR) $(xpcdir)
 
-distuninstallcheck:
-	@:
+dest = $(DESTDIR)$(xpcdir)
+
+remove-stuff:
+	@rm -f $(dest)/fonts.dir
+
+install-data-hook: remove-stuff
+	$(MKFONTSCALE) -b -s -l $(dest)
+
+uninstall-hook: remove-stuff
diff --git a/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am b/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am
index a133c1d47..be7a9bc8a 100644
--- a/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am
+++ b/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am
@@ -1,6 +1,6 @@
 xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts
 
-parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
+parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
 
 XPFONTS = \
         Courier-Bold.pmf \
@@ -17,18 +17,21 @@ XPFONTS = \
         Times-Italic.pmf \
         Times-Roman.pmf
 
-install-data-hook:
-	mkdir -p $(xpcdir) ;								\
-											\
-	for x in $(XPFONTS) ; do							\
-		rm -f $(xpcdir)/$$x	;						\
-		ln -s $(parentdir)/$$x $(xpcdir)/$$x	;				\
+dest = $(DESTDIR)$(xpcdir)
+
+remove-stuff:
+	for x in $(XPFONTS) ; do			\
+		rm -f $(dest)/$$x	;		\
 	done
 
-	@rm -f $(xpcdir)/fonts.scale
-	$(MKFONTSCALE) $(xpcdir)
-	@rm -f $(xpcdir)/font.dir
-	$(MKFONTDIR) $(xpcdir)
+	rm -f $(dest)/fonts.dir
 
-distuninstallcheck:
-	@:
+install-data-hook: remove-stuff
+	mkdir -p $(dest) ;								\
+	for x in $(XPFONTS) ; do							\
+		ln -s $(parentdir)/$$x $(dest)/$$x	;				\
+	done
+
+	$(MKFONTSCALE) -b -s -l $(dest)
+
+uninstall-hook: remove-stuff
diff --git a/XpConfig/Makefile.am b/XpConfig/Makefile.am
index 9d1d9fccc..5549c10c4 100644
--- a/XpConfig/Makefile.am
+++ b/XpConfig/Makefile.am
@@ -683,26 +683,30 @@ US_LOCALES= \
         yi_US \
         yi_US.cp1255
 
-install-data-local:
-	mkdir -p $(xpconfigdir) ;				\
-	mkdir -p $(xpconfigdir)/C;				\
-	mkdir -p $(xpconfigdir)/en_US;				\
-								\
+dest = $(DESTDIR)$(xpconfigdir)
+
+remove-links:
 	for dir in $(US_LOCALES) ; do				\
-		rm -f $(xpconfigdir)/$${dir} ;			\
+		rm -f $(dest)/$${dir} ;			\
 	done ;							\
 								\
+	for dir in $(C_LOCALES) ; do				\
+		rm -f $(dest)/$${dir} ;			\
+	done ;
+
+install-data-local: remove-links
+	mkdir -p $(dest) ;				\
+	mkdir -p $(dest)/C;				\
+	mkdir -p $(dest)/en_US;				\
+								\
 	for dir in $(US_LOCALES) ; do				\
-		ln -s en_US $(xpconfigdir)/$${dir} ;		\
+		ln -s en_US $(dest)/$${dir} ;		\
 	done ; 							\
 								\
 	for dir in $(C_LOCALES) ; do				\
-		rm -f $(xpconfigdir)/$${dir} ;			\
-	done ;							\
-								\
-	for dir in $(C_LOCALES) ; do				\
-		ln -s en_US $(xpconfigdir)/$${dir} ;		\
+		ln -s en_US $(dest)/$${dir} ;		\
 	done ;
 
+uninstall-hook: remove-links
 
 EXTRA_DIST = README
diff --git a/hw/xfree86/utils/xorgcfg/Makefile.am b/hw/xfree86/utils/xorgcfg/Makefile.am
index 1f8c8cb59..0d079233f 100644
--- a/hw/xfree86/utils/xorgcfg/Makefile.am
+++ b/hw/xfree86/utils/xorgcfg/Makefile.am
@@ -140,4 +140,7 @@ dist_man1_MANS =  \
 	xorgcfg.man
 
 EXTRA_DIST = $(XBM_DATA) $(XPM_DATA) XOrgCfg.pre
+
+CLEANFILES = $(APPDEFAULTFILES)
+
 endif