Fix distcheck build and install errors.

19 files changed, 76 insertions, 48 deletions

diff --git a/ChangeLog b/ChangeLog
index 6bb8b099c..80ae57578 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
 2005-09-27  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
+	* XpConfig/C/print/Makefile.am:
+	* XpConfig/C/print/attributes/Makefile.am:
+	* XpConfig/C/print/ddx-config/raster/Makefile.am:
+	* XpConfig/C/print/models/CANONBJ10E-GS/Makefile.am:
+	* XpConfig/C/print/models/CANONC3200-PS/Makefile.am:
+	* XpConfig/C/print/models/GSdefault/Makefile.am:
+	* XpConfig/C/print/models/HPLJ4050-PS/Makefile.am:
+	* XpConfig/C/print/models/HPLJ4family/Makefile.am:
+	* XpConfig/C/print/models/HPLJ4family/fonts/Makefile.am:
+	* XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile.am:
+	* XpConfig/C/print/models/PSdefault/Makefile.am:
+	* XpConfig/C/print/models/PSdefault/fonts/Makefile.am:
+	* XpConfig/C/print/models/PSspooldir/Makefile.am:
+	* XpConfig/C/print/models/SPSPARC2/Makefile.am:
+	* XpConfig/en_US/print/attributes/Makefile.am:
+	* hw/xfree86/dummylib/Makefile.am:
+	* hw/xfree86/utils/xorgcfg/Makefile.am:
+	* hw/xfree86/utils/xorgconfig/Makefile.am:
+	Fix distcheck build and install errors.
+
+2005-09-27  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
 	* hw/dmx/doc/Makefile.am:
 	* hw/xfree86/doc/sgml/Makefile.am:
 	Fix make dist to include only sgml files.
diff --git a/XpConfig/C/print/Makefile.am b/XpConfig/C/print/Makefile.am
index f2ab784e4..0191574f8 100644
--- a/XpConfig/C/print/Makefile.am
+++ b/XpConfig/C/print/Makefile.am
@@ -3,8 +3,8 @@ SUBDIRS = attributes ddx-config models
 xpcdir = @xpconfigdir@/C/print
 
 
-Xprinters.ghostscript: Xprinters
-	sed <Xprinters "s/#Printer xp_pdf_spooldir_tmp_Xprintjobs/Printer xp_pdf_spooldir_tmp_Xprintjobs/" >Xprinters.ghostscript
+Xprinters.ghostscript: $(srcdir)/Xprinters
+	sed < $(srcdir)/Xprinters "s/#Printer xp_pdf_spooldir_tmp_Xprintjobs/Printer xp_pdf_spooldir_tmp_Xprintjobs/" > Xprinters.ghostscript
 
 
 
diff --git a/XpConfig/C/print/attributes/Makefile.am b/XpConfig/C/print/attributes/Makefile.am
index 8ebff054b..0d2cceaff 100644
--- a/XpConfig/C/print/attributes/Makefile.am
+++ b/XpConfig/C/print/attributes/Makefile.am
@@ -1,6 +1,3 @@
 xpcdir = @xpconfigdir@/C/print/attributes
 
-xpc_DATA = document job printer
-
-
-
+dist_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 6264daf8f..79bfb59df 100644
--- a/XpConfig/C/print/ddx-config/raster/Makefile.am
+++ b/XpConfig/C/print/ddx-config/raster/Makefile.am
@@ -1,5 +1,3 @@
 xpcdir = @xpconfigdir@/C/print/ddx-config/raster
 
-xpc_DATA = pcl postscript
-
-
+dist_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 02cc82980..951b9af97 100644
--- a/XpConfig/C/print/models/CANONBJ10E-GS/Makefile.am
+++ b/XpConfig/C/print/models/CANONBJ10E-GS/Makefile.am
@@ -1,4 +1,3 @@
 xpcdir = @xpconfigdir@/C/print/models/CANONBJ10E-GS
 
-xpc_DATA = model-config
-
+dist_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 8c33acccc..771b40864 100644
--- a/XpConfig/C/print/models/CANONC3200-PS/Makefile.am
+++ b/XpConfig/C/print/models/CANONC3200-PS/Makefile.am
@@ -2,5 +2,4 @@ SUBDIRS = fonts
 
 xpcdir = @xpconfigdir@/C/print/models/CANONC3200-PS
 
-xpc_DATA = model-config
-
+dist_xpc_DATA = model-config
diff --git a/XpConfig/C/print/models/GSdefault/Makefile.am b/XpConfig/C/print/models/GSdefault/Makefile.am
index 3ef3ea89c..be0426c76 100644
--- a/XpConfig/C/print/models/GSdefault/Makefile.am
+++ b/XpConfig/C/print/models/GSdefault/Makefile.am
@@ -1,4 +1,3 @@
 xpcdir = @xpconfigdir@/C/print/models/GSdefault
 
-xpc_DATA = model-config
-
+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 a25d364fe..b8cdfa6c4 100644
--- a/XpConfig/C/print/models/HPLJ4050-PS/Makefile.am
+++ b/XpConfig/C/print/models/HPLJ4050-PS/Makefile.am
@@ -2,5 +2,4 @@ SUBDIRS = fonts
 
 xpcdir = @xpconfigdir@/C/print/models/HPLJ4050-PS
 
-xpc_DATA = model-config
-
+dist_xpc_DATA = model-config
diff --git a/XpConfig/C/print/models/HPLJ4family/Makefile.am b/XpConfig/C/print/models/HPLJ4family/Makefile.am
index c246fe33b..2089737a9 100644
--- a/XpConfig/C/print/models/HPLJ4family/Makefile.am
+++ b/XpConfig/C/print/models/HPLJ4family/Makefile.am
@@ -2,4 +2,4 @@ SUBDIRS = fonts
 
 xpcdir = @xpconfigdir@/C/print/models/HPLJ4family
 
-xpc_DATA = model-config
+dist_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 17ba67e9a..daec9d20e 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/Makefile.am
+++ b/XpConfig/C/print/models/HPLJ4family/fonts/Makefile.am
@@ -1,6 +1,6 @@
 xpcdir = @xpconfigdir@/C/print/models/HPLJ4family/fonts
 
-xpc_DATA =			\
+dist_xpc_DATA =			\
 	9nb00051.pmf		\
 	9nb00052.pmf		\
 	9nb00053.pmf		\
diff --git a/XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile.am b/XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile.am
index 520475250..37b57d7bb 100644
--- a/XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile.am
+++ b/XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile.am
@@ -1,3 +1,3 @@
 xpcdir = @xpconfigdir@/C/print/models/PS2PDFspooldir-GS
 
-xpc_DATA = model-config ps2pdf_spooltodir.sh
+dist_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 dea412a4a..46a7d7f2e 100644
--- a/XpConfig/C/print/models/PSdefault/Makefile.am
+++ b/XpConfig/C/print/models/PSdefault/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = fonts
 
 xpcdir = @xpconfigdir@/C/print/models/PSdefault
 
-xpc_DATA = model-config
+dist_xpc_DATA = model-config
 
 install-data-hook:
 	@rm -f $(xpcdir)/fonts.scale
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Makefile.am b/XpConfig/C/print/models/PSdefault/fonts/Makefile.am
index 8458e8193..cde158e73 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Makefile.am
+++ b/XpConfig/C/print/models/PSdefault/fonts/Makefile.am
@@ -1,6 +1,6 @@
 xpcdir = @xpconfigdir@/C/print/models/PSdefault/fonts
 
-xpc_DATA =				\
+dist_xpc_DATA =				\
 	AvantGarde-BookOblique.pmf	\
 	AvantGarde-Book.pmf		\
 	AvantGarde-DemiOblique.pmf	\
diff --git a/XpConfig/C/print/models/PSspooldir/Makefile.am b/XpConfig/C/print/models/PSspooldir/Makefile.am
index 5ff0475a1..d45100ed5 100644
--- a/XpConfig/C/print/models/PSspooldir/Makefile.am
+++ b/XpConfig/C/print/models/PSspooldir/Makefile.am
@@ -1,3 +1,3 @@
 xpcdir = @xpconfigdir@/C/print/models/PSspooldir
 
-xpc_DATA = model-config
+dist_xpc_DATA = model-config
diff --git a/XpConfig/C/print/models/SPSPARC2/Makefile.am b/XpConfig/C/print/models/SPSPARC2/Makefile.am
index 37e820268..5a56f90fb 100644
--- a/XpConfig/C/print/models/SPSPARC2/Makefile.am
+++ b/XpConfig/C/print/models/SPSPARC2/Makefile.am
@@ -2,4 +2,4 @@ SUBDIRS = fonts
 
 xpcdir = @xpconfigdir@/C/print/models/SPSPARC2
 
-xpc_DATA = model-config
+dist_xpc_DATA = model-config
diff --git a/XpConfig/en_US/print/attributes/Makefile.am b/XpConfig/en_US/print/attributes/Makefile.am
index 81d2a1652..8a05004d1 100644
--- a/XpConfig/en_US/print/attributes/Makefile.am
+++ b/XpConfig/en_US/print/attributes/Makefile.am
@@ -1,3 +1,3 @@
 xpcdir = @xpconfigdir@/en_US/print/attributes
 
-xpc_DATA = document
+dist_xpc_DATA = document
diff --git a/hw/xfree86/dummylib/Makefile.am b/hw/xfree86/dummylib/Makefile.am
index 0af326167..74f319ad1 100644
--- a/hw/xfree86/dummylib/Makefile.am
+++ b/hw/xfree86/dummylib/Makefile.am
@@ -47,4 +47,4 @@ libdummy_nonserver_a_SOURCES = \
 	xf86verbose.c \
 	$(srcdir)/../os-support/shared/sigiostubs.c
 
-EXTRA_DIST = README
+EXTRA_DIST = README dummylib.h
diff --git a/hw/xfree86/utils/xorgcfg/Makefile.am b/hw/xfree86/utils/xorgcfg/Makefile.am
index 24a417ffa..1f8c8cb59 100644
--- a/hw/xfree86/utils/xorgcfg/Makefile.am
+++ b/hw/xfree86/utils/xorgcfg/Makefile.am
@@ -49,27 +49,41 @@ CURSESDEFINES  = -DHAS_NCURSES
 endif
 
 xorgcfg_SOURCES =	\
-        accessx.c\
-        card-cfg.c\
-        cards.c\
-        config.c\
-        expert.c\
-        help.c\
-        interface.c\
-        keyboard-cfg.c\
-        $(LDSRCS) \
-        monitor-cfg.c\
-        mouse-cfg.c\
-        options.c\
-        screen-cfg.c\
-        screen.c\
-        $(SNPRINTFSRCS)\
-        startx.c\
-        $(STRLSRCS)\
-        stubs.c\
-        $(TEXTSRC)\
-        vidmode.c\
-        xf86config.c
+        accessx.c \
+        card-cfg.c \
+        cards.c \
+        config.c \
+        expert.c \
+        help.c \
+        interface.c \
+        keyboard-cfg.c \
+        $(LDSRCS)  \
+        monitor-cfg.c \
+        mouse-cfg.c \
+        options.c \
+        screen-cfg.c \
+        screen.c \
+        $(SNPRINTFSRCS) \
+        startx.c \
+        $(STRLSRCS) \
+        stubs.c \
+        $(TEXTSRC) \
+        vidmode.c \
+        xf86config.c \
+        card-cfg.h \
+        cards.h \
+        config.h \
+        help.h \
+        keyboard-cfg.h \
+        loader.h \
+        monitor-cfg.h \
+        mouse-cfg.h \
+        options.h \
+        screen-cfg.h \
+        screen.h \
+        stubs.h \
+        vidmode.h \
+        xf86config.h
 
 XBMdir = $(includedir)/X11/bitmaps
 XPMdir = $(includedir)/X11/pixmaps
@@ -125,4 +139,5 @@ CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS)
 dist_man1_MANS =  \
 	xorgcfg.man
 
+EXTRA_DIST = $(XBM_DATA) $(XPM_DATA) XOrgCfg.pre
 endif
diff --git a/hw/xfree86/utils/xorgconfig/Makefile.am b/hw/xfree86/utils/xorgconfig/Makefile.am
index 25e74d739..17a3f7879 100644
--- a/hw/xfree86/utils/xorgconfig/Makefile.am
+++ b/hw/xfree86/utils/xorgconfig/Makefile.am
@@ -29,7 +29,7 @@
 bin_PROGRAMS = xorgconfig
 
 X11dir = $(libdir)/X11
-X11_DATA = Cards
+dist_X11_DATA = Cards
 
 xorgconfig_CFLAGS = $(DEP_CFLAGS) \
 	-DCARD_DATABASE_FILE='"$(X11dir)/Cards"' \