use variable for font install dir

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@4747 33e552b5-05e3-0310-8538-816dae2090ed

34 files changed, 36 insertions, 33 deletions

diff --git a/rules/xorg-font-adobe-100dpi.make b/rules/xorg-font-adobe-100dpi.make
index 9836cd3fb..260968559 100644
--- a/rules/xorg-font-adobe-100dpi.make
+++ b/rules/xorg-font-adobe-100dpi.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-adobe-100dpi.targetinstall: $(xorg-font-adobe-100dpi_targe
 
 	@cd $(XORG_FONT_ADOBE_100DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/100dpi/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-adobe-75dpi.make b/rules/xorg-font-adobe-75dpi.make
index 5d96ba9a1..7625ab0bb 100644
--- a/rules/xorg-font-adobe-75dpi.make
+++ b/rules/xorg-font-adobe-75dpi.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-adobe-75dpi.targetinstall: $(xorg-font-adobe-75dpi_targeti
 
 	@cd $(XORG_FONT_ADOBE_75DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/75dpi/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
 	done
 
 
diff --git a/rules/xorg-font-adobe-utopia-100dpi.make b/rules/xorg-font-adobe-utopia-100dpi.make
index fb427e552..678ec5518 100644
--- a/rules/xorg-font-adobe-utopia-100dpi.make
+++ b/rules/xorg-font-adobe-utopia-100dpi.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-adobe-utopia-100dpi.targetinstall: $(xorg-font-adobe-utopi
 
 	@cd $(XORG_FONT_ADOBE_UTOPIA_100DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/100dpi/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-adobe-utopia-75dpi.make b/rules/xorg-font-adobe-utopia-75dpi.make
index c85c564df..db752dd77 100644
--- a/rules/xorg-font-adobe-utopia-75dpi.make
+++ b/rules/xorg-font-adobe-utopia-75dpi.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-adobe-utopia-75dpi.targetinstall: $(xorg-font-adobe-utopia
 
 	@cd $(XORG_FONT_ADOBE_UTOPIA_75DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/75dpi/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-adobe-utopia-type1.make b/rules/xorg-font-adobe-utopia-type1.make
index b718a7c8c..114b16df7 100644
--- a/rules/xorg-font-adobe-utopia-type1.make
+++ b/rules/xorg-font-adobe-utopia-type1.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-adobe-utopia-type1.targetinstall: $(xorg-font-adobe-utopia
 
 	@cd $(XORG_FONT_ADOBE_UTOPIA_TYPE1_DIR); \
 	for file in *.afm *.pfa; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/Type1/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Type1/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-arabic-misc.make b/rules/xorg-font-arabic-misc.make
index f82b58198..c5fc5f5bb 100644
--- a/rules/xorg-font-arabic-misc.make
+++ b/rules/xorg-font-arabic-misc.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-arabic-misc.targetinstall: $(xorg-font-arabic-misc_targeti
 
 	@cd $(XORG_FONT_ARABIC_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/misc/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-bh-100dpi.make b/rules/xorg-font-bh-100dpi.make
index 9f8f33394..371e7c7b5 100644
--- a/rules/xorg-font-bh-100dpi.make
+++ b/rules/xorg-font-bh-100dpi.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-bh-100dpi.targetinstall: $(xorg-font-bh-100dpi_targetinsta
 
 	@cd $(XORG_FONT_BH_100DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/100dpi/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-bh-75dpi.make b/rules/xorg-font-bh-75dpi.make
index a5fdd39ee..0b73467de 100644
--- a/rules/xorg-font-bh-75dpi.make
+++ b/rules/xorg-font-bh-75dpi.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-bh-75dpi.targetinstall: $(xorg-font-bh-75dpi_targetinstall
 
 	@cd $(XORG_FONT_BH_75DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/75dpi/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-bh-lucidatypewriter-100dpi.make b/rules/xorg-font-bh-lucidatypewriter-100dpi.make
index c71765bee..e8c6f9536 100644
--- a/rules/xorg-font-bh-lucidatypewriter-100dpi.make
+++ b/rules/xorg-font-bh-lucidatypewriter-100dpi.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-bh-lucidatypewriter-100dpi.targetinstall: $(xorg-font-bh-l
 
 	@cd $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/100dpi/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-bh-lucidatypewriter-75dpi.make b/rules/xorg-font-bh-lucidatypewriter-75dpi.make
index 0b1adaed5..83edceff8 100644
--- a/rules/xorg-font-bh-lucidatypewriter-75dpi.make
+++ b/rules/xorg-font-bh-lucidatypewriter-75dpi.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-bh-lucidatypewriter-75dpi.targetinstall: $(xorg-font-bh-lu
 
 	@cd $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/75dpi/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-bitstream-100dpi.make b/rules/xorg-font-bitstream-100dpi.make
index eee6b9175..b6cc763d8 100644
--- a/rules/xorg-font-bitstream-100dpi.make
+++ b/rules/xorg-font-bitstream-100dpi.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-bitstream-100dpi.targetinstall: $(xorg-font-bitstream-100d
 
 	@cd $(XORG_FONT_BITSTREAM_100DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/100dpi/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-bitstream-75dpi.make b/rules/xorg-font-bitstream-75dpi.make
index a98a5fd05..edbc644a2 100644
--- a/rules/xorg-font-bitstream-75dpi.make
+++ b/rules/xorg-font-bitstream-75dpi.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-bitstream-75dpi.targetinstall: $(xorg-font-bitstream-75dpi
 
 	@cd $(XORG_FONT_BITSTREAM_75DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/75dpi/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-bitstream-speedo.make b/rules/xorg-font-bitstream-speedo.make
index 4f632efd2..31dfe9011 100644
--- a/rules/xorg-font-bitstream-speedo.make
+++ b/rules/xorg-font-bitstream-speedo.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-bitstream-speedo.targetinstall: $(xorg-font-bitstream-spee
 
 	@cd $(XORG_FONT_BITSTREAM_SPEEDO_DIR); \
 	for file in *.spd; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/Speedo/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Speedo/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-bitstream-type1.make b/rules/xorg-font-bitstream-type1.make
index 4904bb5ba..d0eef2724 100644
--- a/rules/xorg-font-bitstream-type1.make
+++ b/rules/xorg-font-bitstream-type1.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-bitstream-type1.targetinstall: $(xorg-font-bitstream-type1
 
 	@cd $(XORG_FONT_BITSTREAM_TYPE1_DIR); \
 	for file in *.afm *.pfb; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/Type1/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Type1/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-cronyx-cyrillic.make b/rules/xorg-font-cronyx-cyrillic.make
index e70b1d922..ea5b715a6 100644
--- a/rules/xorg-font-cronyx-cyrillic.make
+++ b/rules/xorg-font-cronyx-cyrillic.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-cronyx-cyrillic.targetinstall: $(xorg-font-cronyx-cyrillic
 
 	@cd $(XORG_FONT_CRONYX_CYRILLIC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/cyrillic/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/cyrillic/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-cursor-misc.make b/rules/xorg-font-cursor-misc.make
index a5a9de78f..3bcbfa5e5 100644
--- a/rules/xorg-font-cursor-misc.make
+++ b/rules/xorg-font-cursor-misc.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-cursor-misc.targetinstall: $(xorg-font-cursor-misc_targeti
 
 	@cd $(XORG_FONT_CURSOR_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/misc/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-daewoo-misc.make b/rules/xorg-font-daewoo-misc.make
index 9a9219a48..37c837580 100644
--- a/rules/xorg-font-daewoo-misc.make
+++ b/rules/xorg-font-daewoo-misc.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-daewoo-misc.targetinstall: $(xorg-font-daewoo-misc_targeti
 
 	@cd $(XORG_FONT_DAEWOO_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/misc/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-dec-misc.make b/rules/xorg-font-dec-misc.make
index d33b6fadc..15e466f1d 100644
--- a/rules/xorg-font-dec-misc.make
+++ b/rules/xorg-font-dec-misc.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-dec-misc.targetinstall: $(xorg-font-dec-misc_targetinstall
 
 	@cd $(XORG_FONT_DEC_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/misc/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-ibm-type1.make b/rules/xorg-font-ibm-type1.make
index 629a7970d..150f15f59 100644
--- a/rules/xorg-font-ibm-type1.make
+++ b/rules/xorg-font-ibm-type1.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-ibm-type1.targetinstall: $(xorg-font-ibm-type1_targetinsta
 
 	@cd $(XORG_FONT_IBM_TYPE1_DIR); \
 	for file in *.pfa *.afm; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/Type1/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Type1/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-isas-misc.make b/rules/xorg-font-isas-misc.make
index 9d581b62c..13e715ccc 100644
--- a/rules/xorg-font-isas-misc.make
+++ b/rules/xorg-font-isas-misc.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-isas-misc.targetinstall: $(xorg-font-isas-misc_targetinsta
 
 	@cd $(XORG_FONT_ISAS_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/misc/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-jis-misc.make b/rules/xorg-font-jis-misc.make
index 0aca277f7..79fb83f72 100644
--- a/rules/xorg-font-jis-misc.make
+++ b/rules/xorg-font-jis-misc.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-jis-misc.targetinstall: $(xorg-font-jis-misc_targetinstall
 
 	@cd $(XORG_FONT_JIS_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/misc/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-micro-misc.make b/rules/xorg-font-micro-misc.make
index e64542c68..d0b254a17 100644
--- a/rules/xorg-font-micro-misc.make
+++ b/rules/xorg-font-micro-misc.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-micro-misc.targetinstall: $(xorg-font-micro-misc_targetins
 
 	@cd $(XORG_FONT_MICRO_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/misc/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-misc-cyrillic.make b/rules/xorg-font-misc-cyrillic.make
index 7a1b886d4..bd4160948 100644
--- a/rules/xorg-font-misc-cyrillic.make
+++ b/rules/xorg-font-misc-cyrillic.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-misc-cyrillic.targetinstall: $(xorg-font-misc-cyrillic_tar
 
 	@cd $(XORG_FONT_MISC_CYRILLIC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/cyrillic/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/cyrillic/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-misc-ethiopic.make b/rules/xorg-font-misc-ethiopic.make
index fe41d5149..68d14108a 100644
--- a/rules/xorg-font-misc-ethiopic.make
+++ b/rules/xorg-font-misc-ethiopic.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-misc-ethiopic.targetinstall: $(xorg-font-misc-ethiopic_tar
 
 	@cd $(XORG_FONT_MISC_ETHIOPIC_DIR); \
 	for file in *.otf *.ttf; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/misc/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-misc-meltho.make b/rules/xorg-font-misc-meltho.make
index d7a545579..92d94840e 100644
--- a/rules/xorg-font-misc-meltho.make
+++ b/rules/xorg-font-misc-meltho.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-misc-meltho.targetinstall: $(xorg-font-misc-meltho_targeti
 
 	@cd $(XORG_FONT_MISC_MELTHO_DIR); \
 	for file in *.otf; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/misc/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-misc-misc.make b/rules/xorg-font-misc-misc.make
index 4895681ae..b36ed514c 100644
--- a/rules/xorg-font-misc-misc.make
+++ b/rules/xorg-font-misc-misc.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-misc-misc.targetinstall: $(xorg-font-misc-misc_targetinsta
 
 	@cd $(XORG_FONT_MISC_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/misc/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-mutt-misc.make b/rules/xorg-font-mutt-misc.make
index d8168fac1..d9fcbc808 100644
--- a/rules/xorg-font-mutt-misc.make
+++ b/rules/xorg-font-mutt-misc.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-mutt-misc.targetinstall: $(xorg-font-mutt-misc_targetinsta
 
 	@cd $(XORG_FONT_MUTT_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/misc/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-schumacher-misc.make b/rules/xorg-font-schumacher-misc.make
index a4dd3a441..567b9a102 100644
--- a/rules/xorg-font-schumacher-misc.make
+++ b/rules/xorg-font-schumacher-misc.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-schumacher-misc.targetinstall: $(xorg-font-schumacher-misc
 
 	@cd $(XORG_FONT_SCHUMACHER_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/misc/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-screen-cyrillic.make b/rules/xorg-font-screen-cyrillic.make
index be5977565..6f297ddb8 100644
--- a/rules/xorg-font-screen-cyrillic.make
+++ b/rules/xorg-font-screen-cyrillic.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-screen-cyrillic.targetinstall: $(xorg-font-screen-cyrillic
 
 	@cd $(XORG_FONT_SCREEN_CYRILLIC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/cyrillic/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/cyrillic/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-sony-misc.make b/rules/xorg-font-sony-misc.make
index ba4291cf1..d4b726a1b 100644
--- a/rules/xorg-font-sony-misc.make
+++ b/rules/xorg-font-sony-misc.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-sony-misc.targetinstall: $(xorg-font-sony-misc_targetinsta
 
 	@cd $(XORG_FONT_SONY_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/misc/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-sun-misc.make b/rules/xorg-font-sun-misc.make
index 1488a51b7..641fbdc03 100644
--- a/rules/xorg-font-sun-misc.make
+++ b/rules/xorg-font-sun-misc.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-sun-misc.targetinstall: $(xorg-font-sun-misc_targetinstall
 
 	@cd $(XORG_FONT_SUN_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/misc/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-winitzki-cyrillic.make b/rules/xorg-font-winitzki-cyrillic.make
index 921c3b80a..57da25322 100644
--- a/rules/xorg-font-winitzki-cyrillic.make
+++ b/rules/xorg-font-winitzki-cyrillic.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-winitzki-cyrillic.targetinstall: $(xorg-font-winitzki-cyri
 
 	@cd $(XORG_FONT_WINITZKI_CYRILLIC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/cyrillic/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/cyrillic/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-font-xfree86-type1.make b/rules/xorg-font-xfree86-type1.make
index e5c19ce89..08fe9896c 100644
--- a/rules/xorg-font-xfree86-type1.make
+++ b/rules/xorg-font-xfree86-type1.make
@@ -117,7 +117,7 @@ $(STATEDIR)/xorg-font-xfree86-type1.targetinstall: $(xorg-font-xfree86-type1_tar
 
 	@cd $(XORG_FONT_XFREE86_TYPE1_DIR); \
 	for file in *.pfa; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_PREFIX)/lib/X11/fonts/Type1/$$file, n); \
+		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Type1/$$file, n); \
 	done
 
 	@$(call install_finish)
diff --git a/rules/xorg-server.make b/rules/xorg-server.make
index c089661e3..ffa869808 100644
--- a/rules/xorg-server.make
+++ b/rules/xorg-server.make
@@ -26,8 +26,11 @@ XORG_SERVER_DIR		:= $(BUILDDIR)/$(XORG_SERVER)
 
 -include $(call package_depfile)
 
+# these are the defaults taken from the xorg server ./configure script
+# FIXME: perhaps make them configurable
 XORG_PREFIX = /usr
 XORG_LIBDIR = $(XORG_PREFIX)/lib
+XORG_FONTDIR = $(XORG_LIBDIR)/X11/fonts
 
 # ----------------------------------------------------------------------------
 # Get