Get XpConfig build system in pretty much working state

18 files changed, 149 insertions, 25 deletions

diff --git a/XpConfig/C/print/Makefile.am b/XpConfig/C/print/Makefile.am
index 32abac8a4..f2ab784e4 100644
--- a/XpConfig/C/print/Makefile.am
+++ b/XpConfig/C/print/Makefile.am
@@ -1,5 +1,12 @@
 SUBDIRS = attributes ddx-config models
 
-EXTRA_DIST = Xprinters ## FIXME
+xpcdir = @xpconfigdir@/C/print
 
 
+Xprinters.ghostscript: Xprinters
+	sed <Xprinters "s/#Printer xp_pdf_spooldir_tmp_Xprintjobs/Printer xp_pdf_spooldir_tmp_Xprintjobs/" >Xprinters.ghostscript
+
+
+
+dist_xpc_DATA = Xprinters
+xpc_DATA = Xprinters.ghostscript
diff --git a/XpConfig/C/print/attributes/Makefile.am b/XpConfig/C/print/attributes/Makefile.am
index 9dfe6e047..8ebff054b 100644
--- a/XpConfig/C/print/attributes/Makefile.am
+++ b/XpConfig/C/print/attributes/Makefile.am
@@ -1,4 +1,6 @@
-EXTRA_DIST = document job printer		## FIXME
+xpcdir = @xpconfigdir@/C/print/attributes
+
+xpc_DATA = document job printer
 
 
 
diff --git a/XpConfig/C/print/ddx-config/raster/Makefile.am b/XpConfig/C/print/ddx-config/raster/Makefile.am
index 007481a6d..6264daf8f 100644
--- a/XpConfig/C/print/ddx-config/raster/Makefile.am
+++ b/XpConfig/C/print/ddx-config/raster/Makefile.am
@@ -1,2 +1,5 @@
-EXTRA_DIST = pcl postscript    ## FIXME
+xpcdir = @xpconfigdir@/C/print/ddx-config/raster
+
+xpc_DATA = pcl postscript
+
 
diff --git a/XpConfig/C/print/models/CANONBJ10E-GS/Makefile.am b/XpConfig/C/print/models/CANONBJ10E-GS/Makefile.am
index 927e5ab99..02cc82980 100644
--- a/XpConfig/C/print/models/CANONBJ10E-GS/Makefile.am
+++ b/XpConfig/C/print/models/CANONBJ10E-GS/Makefile.am
@@ -1 +1,4 @@
-EXTRA_DIST = Makefile.am model-config ## FIXME
+xpcdir = @xpconfigdir@/C/print/models/CANONBJ10E-GS
+
+xpc_DATA = model-config
+
diff --git a/XpConfig/C/print/models/CANONC3200-PS/Makefile.am b/XpConfig/C/print/models/CANONC3200-PS/Makefile.am
index 650e96fb6..586ce9f1b 100644
--- a/XpConfig/C/print/models/CANONC3200-PS/Makefile.am
+++ b/XpConfig/C/print/models/CANONC3200-PS/Makefile.am
@@ -1 +1,4 @@
-EXTRA_DIST = model-config ## FIXME
+xpcdir = @xpconfigdir@/C/print/models/CANONC3200-PS
+
+xpc_DATA = model-config
+
diff --git a/XpConfig/C/print/models/GSdefault/Makefile.am b/XpConfig/C/print/models/GSdefault/Makefile.am
index 650e96fb6..3ef3ea89c 100644
--- a/XpConfig/C/print/models/GSdefault/Makefile.am
+++ b/XpConfig/C/print/models/GSdefault/Makefile.am
@@ -1 +1,4 @@
-EXTRA_DIST = model-config ## FIXME
+xpcdir = @xpconfigdir@/C/print/models/GSdefault
+
+xpc_DATA = model-config
+
diff --git a/XpConfig/C/print/models/HPDJ1600C/Makefile.am b/XpConfig/C/print/models/HPDJ1600C/Makefile.am
index c20743ee7..67d92a13d 100644
--- a/XpConfig/C/print/models/HPDJ1600C/Makefile.am
+++ b/XpConfig/C/print/models/HPDJ1600C/Makefile.am
@@ -1 +1,5 @@
-EXTRA_DIST = fonts model-config ## FIXME
+SUBDIRS = fonts
+
+xpc_data = @xpconfigdir@/C/print/models/HPDJ1600C
+
+dist_xpc_data = model-config
diff --git a/XpConfig/C/print/models/HPLJ4050-PS/Makefile.am b/XpConfig/C/print/models/HPLJ4050-PS/Makefile.am
index 650e96fb6..0f7d80e5d 100644
--- a/XpConfig/C/print/models/HPLJ4050-PS/Makefile.am
+++ b/XpConfig/C/print/models/HPLJ4050-PS/Makefile.am
@@ -1 +1,4 @@
-EXTRA_DIST = model-config ## FIXME
+xpcdir = @xpconfigdir@/C/print/models/HPLJ4050-PS
+
+xpc_DATA = model-config
+
diff --git a/XpConfig/C/print/models/HPLJ4family/Makefile.am b/XpConfig/C/print/models/HPLJ4family/Makefile.am
index c20743ee7..c246fe33b 100644
--- a/XpConfig/C/print/models/HPLJ4family/Makefile.am
+++ b/XpConfig/C/print/models/HPLJ4family/Makefile.am
@@ -1 +1,5 @@
-EXTRA_DIST = fonts model-config ## FIXME
+SUBDIRS = fonts 
+
+xpcdir = @xpconfigdir@/C/print/models/HPLJ4family
+
+xpc_DATA = model-config
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/Makefile.am b/XpConfig/C/print/models/HPLJ4family/fonts/Makefile.am
index 3891a519b..17ba67e9a 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/Makefile.am
+++ b/XpConfig/C/print/models/HPLJ4family/fonts/Makefile.am
@@ -1 +1,50 @@
-EXTRA_DIST = 9nb00051.pmf 9nb00052.pmf 9nb00053.pmf 9nb00054.pmf 9nb00055.pmf 9nb00056.pmf 9nb00057.pmf 9nb00058.pmf 9nb00059.pmf 9nb00060.pmf 9nb00061.pmf 9nb00062.pmf 9nb00063.pmf 9nb00064.pmf 9nb00065.pmf 9nb00066.pmf 9nb00067.pmf 9nb00068.pmf 9nb00069.pmf 9nb00070.pmf 9nb00071.pmf 9nb00072.pmf 9nb00073.pmf 9nb00074.pmf 9nb00075.pmf 9nb00076.pmf 9nb00077.pmf 9nb00079.pmf 9nb00080.pmf 9nb00081.pmf 9nb00082.pmf 9nb00083.pmf 9nb00084.pmf 9nb00085.pmf 9nb00086.pmf 9nb00087.pmf 9nb00088.pmf 9nb00089.pmf 9nb00090.pmf 9nb00091.pmf 9nb00092.pmf 9nb00093.pmf 9nb00094.pmf fonts.alias fonts.dir lpr0ye1a.pmf Makefile.am README ## FIXME
+xpcdir = @xpconfigdir@/C/print/models/HPLJ4family/fonts
+
+xpc_DATA =			\
+	9nb00051.pmf		\
+	9nb00052.pmf		\
+	9nb00053.pmf		\
+	9nb00054.pmf		\
+	9nb00055.pmf		\
+	9nb00056.pmf		\
+	9nb00057.pmf		\
+	9nb00058.pmf		\
+	9nb00059.pmf		\
+	9nb00060.pmf		\
+	9nb00061.pmf		\
+	9nb00062.pmf		\
+	9nb00063.pmf		\
+	9nb00064.pmf		\
+	9nb00065.pmf		\
+	9nb00066.pmf		\
+	9nb00067.pmf		\
+	9nb00068.pmf		\
+	9nb00069.pmf		\
+	9nb00070.pmf		\
+	9nb00071.pmf		\
+	9nb00072.pmf		\
+	9nb00073.pmf		\
+	9nb00074.pmf		\
+	9nb00075.pmf		\
+	9nb00076.pmf		\
+	9nb00077.pmf		\
+	9nb00079.pmf		\
+	9nb00080.pmf		\
+	9nb00081.pmf		\
+	9nb00082.pmf		\
+	9nb00083.pmf		\
+	9nb00084.pmf		\
+	9nb00085.pmf		\
+	9nb00086.pmf		\
+	9nb00087.pmf		\
+	9nb00088.pmf		\
+	9nb00089.pmf		\
+	9nb00090.pmf		\
+	9nb00091.pmf		\
+	9nb00092.pmf		\
+	9nb00093.pmf		\
+	9nb00094.pmf		\
+	fonts.alias		\
+	fonts.dir		\
+	lpr0ye1a.pmf		\
+	README
diff --git a/XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile.am b/XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile.am
index e5f57d5b0..520475250 100644
--- a/XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile.am
+++ b/XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile.am
@@ -1 +1,3 @@
-EXTRA_DIST = model-config ps2pdf_spooltodir.sh ## FIXME
+xpcdir = @xpconfigdir@/C/print/models/PS2PDFspooldir-GS
+
+xpc_DATA = model-config ps2pdf_spooltodir.sh
diff --git a/XpConfig/C/print/models/PSdefault/Makefile.am b/XpConfig/C/print/models/PSdefault/Makefile.am
index 2af468da0..be7064ea1 100644
--- a/XpConfig/C/print/models/PSdefault/Makefile.am
+++ b/XpConfig/C/print/models/PSdefault/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS = fonts
 
-EXTRA_DIST = fonts model-config ## FIXME
+xpcdir = @xpconfigdir@/C/print/models/PSdefault
+
+xpc_DATA = model-config
+
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Makefile.am b/XpConfig/C/print/models/PSdefault/fonts/Makefile.am
index 99156b650..f4d15a095 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Makefile.am
+++ b/XpConfig/C/print/models/PSdefault/fonts/Makefile.am
@@ -1 +1,33 @@
-EXTRA_DIST = AvantGarde-BookOblique.pmf AvantGarde-Book.pmf AvantGarde-DemiOblique.pmf AvantGarde-Demi.pmf Courier-BoldOblique.pmf Courier-Bold.pmf Courier-Oblique.pmf Courier.pmf Helvetica-BoldOblique.pmf Helvetica-Bold.pmf Helvetica-Oblique.pmf Helvetica.pmf LubalinGraph-BookOblique.pmf LubalinGraph-Book.pmf LubalinGraph-DemiOblique.pmf LubalinGraph-Demi.pmf NewCenturySchlbk-BoldItalic.pmf NewCenturySchlbk-Bold.pmf NewCenturySchlbk-Italic.pmf NewCenturySchlbk-Roman.pmf Souvenir-DemiItalic.pmf Souvenir-Demi.pmf Souvenir-LightItalic.pmf Souvenir-Light.pmf Symbol.pmf Times-BoldItalic.pmf Times-Bold.pmf Times-Italic.pmf Times-Roman.pmf ZapfDingbats.pmf ## FIXME
+xpcdir = @xpconfigdir@/C/print/models/PSdefault/fonts
+
+xpc_DATA =				\
+	AvantGarde-BookOblique.pmf	\
+	AvantGarde-Book.pmf		\
+	AvantGarde-DemiOblique.pmf	\
+	AvantGarde-Demi.pmf		\
+	Courier-BoldOblique.pmf		\
+	Courier-Bold.pmf		\
+	Courier-Oblique.pmf		\
+	Courier.pmf			\
+	Helvetica-BoldOblique.pmf	\
+	Helvetica-Bold.pmf		\
+	Helvetica-Oblique.pmf		\
+	Helvetica.pmf			\
+	LubalinGraph-BookOblique.pmf	\
+	LubalinGraph-Book.pmf		\
+	LubalinGraph-DemiOblique.pmf	\
+	LubalinGraph-Demi.pmf		\
+	NewCenturySchlbk-BoldItalic.pmf	\
+	NewCenturySchlbk-Bold.pmf	\
+	NewCenturySchlbk-Italic.pmf	\
+	NewCenturySchlbk-Roman.pmf	\
+	Souvenir-DemiItalic.pmf		\
+	Souvenir-Demi.pmf		\
+	Souvenir-LightItalic.pmf	\
+	Souvenir-Light.pmf		\
+	Symbol.pmf			\
+	Times-BoldItalic.pmf		\
+	Times-Bold.pmf			\
+	Times-Italic.pmf		\
+	Times-Roman.pmf			\
+	ZapfDingbats.pmf
diff --git a/XpConfig/C/print/models/PSspooldir/Makefile.am b/XpConfig/C/print/models/PSspooldir/Makefile.am
index 650e96fb6..5ff0475a1 100644
--- a/XpConfig/C/print/models/PSspooldir/Makefile.am
+++ b/XpConfig/C/print/models/PSspooldir/Makefile.am
@@ -1 +1,3 @@
-EXTRA_DIST = model-config ## FIXME
+xpcdir = @xpconfigdir@/C/print/models/PSspooldir
+
+xpc_DATA = model-config
diff --git a/XpConfig/C/print/models/SPSPARC2/Makefile.am b/XpConfig/C/print/models/SPSPARC2/Makefile.am
index 322cb87d2..a73424ef6 100644
--- a/XpConfig/C/print/models/SPSPARC2/Makefile.am
+++ b/XpConfig/C/print/models/SPSPARC2/Makefile.am
@@ -1 +1 @@
-# FIXME this directory is actually empty
+# FIXME, find out what the monolith does with this empty directory
diff --git a/XpConfig/Makefile.am b/XpConfig/Makefile.am
index 9cefeda4b..9d1d9fccc 100644
--- a/XpConfig/Makefile.am
+++ b/XpConfig/Makefile.am
@@ -7,7 +7,7 @@
 
 SUBDIRS = C en_US
 
-xpconfigdir = $(libdir)/X11/xserver
+xpconfigdir = @xpconfigdir@
 
 C_LOCALES= \
 	POSIX \
@@ -685,25 +685,23 @@ US_LOCALES= \
 
 install-data-local:
 	mkdir -p $(xpconfigdir) ;				\
-	mkdir -p $(xpconfigdir)/C				\
-	mkdir -p $(xpconfigdir)/en_US				\
-								\
-	cd $(xpconfigdir) ;					\
+	mkdir -p $(xpconfigdir)/C;				\
+	mkdir -p $(xpconfigdir)/en_US;				\
 								\
 	for dir in $(US_LOCALES) ; do				\
-		rm -f $${dir} ;					\
+		rm -f $(xpconfigdir)/$${dir} ;			\
 	done ;							\
 								\
 	for dir in $(US_LOCALES) ; do				\
-		ln -s en_US $${dir} ;				\
+		ln -s en_US $(xpconfigdir)/$${dir} ;		\
 	done ; 							\
 								\
 	for dir in $(C_LOCALES) ; do				\
-		rm -f $${dir} ;					\
+		rm -f $(xpconfigdir)/$${dir} ;			\
 	done ;							\
 								\
 	for dir in $(C_LOCALES) ; do				\
-		ln -s en_US $${dir} ;				\
+		ln -s en_US $(xpconfigdir)/$${dir} ;		\
 	done ;
 
 
diff --git a/XpConfig/en_US/print/attributes/Makefile.am b/XpConfig/en_US/print/attributes/Makefile.am
index adffc4854..81d2a1652 100644
--- a/XpConfig/en_US/print/attributes/Makefile.am
+++ b/XpConfig/en_US/print/attributes/Makefile.am
@@ -1 +1,3 @@
-EXTRA_DIST = documents  ## FIXME
+xpcdir = @xpconfigdir@/en_US/print/attributes
+
+xpc_DATA = document
diff --git a/configure.ac b/configure.ac
index db6b5c130..a6475b1f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -918,6 +918,9 @@ if test "x$XPRINT" = xyes; then
 	XPRINT_INCLUDES="$XEXT_INC $RENDER_INC $COMPOSITE_INC $RANDR_INC $XI_INC $FIXES_INC $DAMAGE_INC $XI_INC $GLX_INC"
 	XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $XKB_STUB_LIB $OS_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB $GLX_INC"
 	AC_SUBST([XPRINT_LIBS])
+
+	xpconfigdir=$libdir/X11/xserver
+	AC_SUBST([xpconfigdir])
 fi
 
 
@@ -1172,6 +1175,7 @@ XpConfig/C/print/models/CANONC3200-PS/Makefile
 XpConfig/C/print/models/HPLJ4family/fonts/Makefile
 XpConfig/C/print/models/HPLJ4family/Makefile
 XpConfig/C/print/models/HPDJ1600C/Makefile
+XpConfig/C/print/models/HPDJ1600C/fonts/Makefile
 XpConfig/C/print/Makefile
 XpConfig/C/Makefile
 XpConfig/en_US/print/attributes/Makefile