From: Erwin Rol <[email protected]>

Add a menu option to install a /etc/X11/xorg.conf file
via the install_alternative mechanism.

Signed-off-by: Erwin Rol <[email protected]>
---
 rules/xorg-server.in   |   15 +++++++++++++++
 rules/xorg-server.make |    5 +++++
 2 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/rules/xorg-server.in b/rules/xorg-server.in
index 1e8bfd3..150579e 100644
--- a/rules/xorg-server.in
+++ b/rules/xorg-server.in
@@ -207,6 +207,21 @@ endmenu
 
 # ----------------------------------------------------------------------------
 
+menu "xorg config files             "
+
+
+config XORG_SERVER_CONFIG_FILES_XORG_CONF
+       bool
+       prompt "/etc/X11/xorg.conf"
+       help
+         Install a /etc/X11/xorg.conf file from
+         projectroot or generic
+
+endmenu
+
+
+# ----------------------------------------------------------------------------
+
 menu "xorg options                  "
 
 config XORG_SERVER_OPT_NULL_ROOT_CURSOR
diff --git a/rules/xorg-server.make b/rules/xorg-server.make
index 8f98bae..f1780a9 100644
--- a/rules/xorg-server.make
+++ b/rules/xorg-server.make
@@ -359,6 +359,11 @@ $(STATEDIR)/xorg-server.targetinstall:
        @$(call install_fixup, xorg-server,DEPENDS,)
        @$(call install_fixup, xorg-server,DESCRIPTION,missing)
 
+ifdef PTXCONF_XORG_SERVER_CONFIG_FILES_XORG_CONF
+       @$(call install_alternative, xorg-server, 0, 0, 0644, \
+               /etc/X11/xorg.conf)
+endif
+
 ifdef PTXCONF_XORG_SERVER_XVFB
        @$(call install_copy, xorg-server, 0, 0, 0755, -, \
                $(XORG_PREFIX)/bin/Xvfb)
-- 
1.6.0.6


--
ptxdist mailing list
[email protected]

Reply via email to