xserver: Branch 'server-1_1-branch' - 2 commits

[Donnie Berkholz]

 Xprint/Makefile.am            |    2 +-
 Xprint/etc/init.d/Makefile.am |   11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
diff-tree 90f96f5bcb444380f2fccda21dbf0a623e84ee3f (from bd295749b7d15fa5152a8bdce2552c6f813aa076)
Author: Ed Catmur <ed at catmur.co.uk>
Date:   Thu Jul 6 17:49:55 2006 -0700

    Remove hardcoded 'lib' in XPRINTDIR.
    (cherry picked from 2152e2d364bdd179cf218cde446c763d8c8bb833 commit)

diff --git a/Xprint/Makefile.am b/Xprint/Makefile.am
index 3d6a7f6..5006314 100644
--- a/Xprint/Makefile.am
+++ b/Xprint/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = Xprt
 
 Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
 	-DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
-	-DXPRINTDIR=\"$(prefix)/X11/xserver\"    \
+	-DXPRINTDIR=\"$(libdir)/X11/xserver\"    \
 	-DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
 
 Xprt_LDFLAGS = -L$(top_srcdir)
diff-tree bd295749b7d15fa5152a8bdce2552c6f813aa076 (from 3af474609d45e8dc89deba54996de917c8e27af9)
Author: Ed Catmur <ed at catmur.co.uk>
Date:   Thu Jul 6 17:48:51 2006 -0700

    Generate xprint.pre from xprint.cpp.
    (cherry picked from 233c004641483a75985e09fea5416ab2c7a97fc4 commit)

diff --git a/Xprint/etc/init.d/Makefile.am b/Xprint/etc/init.d/Makefile.am
index cc03cfa..dfe8012 100644
--- a/Xprint/etc/init.d/Makefile.am
+++ b/Xprint/etc/init.d/Makefile.am
@@ -1 +1,12 @@
+include $(top_srcdir)/cpprules.in
+
+noinst_PRE = xprint
+BUILT_SOURCES = $(noinst_PRE)
+CLEANFILES = $(noinst_PRE) xprint.pre
+
+CPP_FILES_FLAGS = -DProjectRoot='"$(PROJECTROOT)"' -DOS_LINUX
+
+xprint.pre: xprint.cpp
+	$(SED) -e 's/^\(\s\+\)#/\1XCOMM/' $< > $@
+
 EXTRA_DIST = xprint.cpp