[Lunar-commits] <moonbase> xorg apps: standardize on /etc/X11/app-defaults/

[Paul Bredbury]

commit 3270fd29ba7ea01ecc433396a6567144d452178b
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Thu Feb 24 17:25:55 2011 +0700

    xorg apps: standardize on /etc/X11/app-defaults/
---
 science/xephem/BUILD     |    6 +++---
 xorg7/app/bitmap/BUILD   |    4 ++++
 xorg7/app/xclock/BUILD   |    4 ++++
 xorg7/app/xmessage/BUILD |    4 ++++
 xorg7/extra/xterm/BUILD  |    8 ++++----
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/science/xephem/BUILD b/science/xephem/BUILD
index d801daa..d93f90b 100644
--- a/science/xephem/BUILD
+++ b/science/xephem/BUILD
@@ -2,7 +2,7 @@
 
   patch_it $SOURCE_CACHE/$SOURCE2 0  &&
 
-  # Make the makefiles obay our CFLAGS!
+  # Make the makefiles obey our CFLAGS!
   sedit "s:^CFLAGS[ ]*=\(.*\)-O2\(.*\):CFLAGS= \1 \2 $CFLAGS:" libastro/Makefile
   sedit "s:^CFLAGS[ ]*=\(.*\)-O2\(.*\):CFLAGS= \1 \2 $CFLAGS:" libip/Makefile
   sedit "s:^CFLAGS[ ]*=\(.*\)-O2\(.*\):CFLAGS= \1 \2 $CFLAGS:" libjpegd/Makefile
@@ -22,6 +22,6 @@
   done &&
 
   echo "XEphem.ShareDir: /opt/xephem" > XEphem &&
-  install -m0644 XEphem /usr/lib/X11/app-defaults/
-  
+  install -m0644 XEphem /etc/X11/app-defaults/
+
 ) > $C_FIFO
diff --git a/xorg7/app/bitmap/BUILD b/xorg7/app/bitmap/BUILD
index cfe3408..d6b5ad3 100644
--- a/xorg7/app/bitmap/BUILD
+++ b/xorg7/app/bitmap/BUILD
@@ -1,6 +1,10 @@
 (
+
   . /etc/profile.d/x11r7.rc &&
 
+  # Standard Lunar directory
+  OPTS+=" --with-appdefaultdir=/etc/X11/app-defaults" &&
+
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/xorg7/app/xclock/BUILD b/xorg7/app/xclock/BUILD
index cfe3408..d6b5ad3 100644
--- a/xorg7/app/xclock/BUILD
+++ b/xorg7/app/xclock/BUILD
@@ -1,6 +1,10 @@
 (
+
   . /etc/profile.d/x11r7.rc &&
 
+  # Standard Lunar directory
+  OPTS+=" --with-appdefaultdir=/etc/X11/app-defaults" &&
+
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/xorg7/app/xmessage/BUILD b/xorg7/app/xmessage/BUILD
index cfe3408..d6b5ad3 100644
--- a/xorg7/app/xmessage/BUILD
+++ b/xorg7/app/xmessage/BUILD
@@ -1,6 +1,10 @@
 (
+
   . /etc/profile.d/x11r7.rc &&
 
+  # Standard Lunar directory
+  OPTS+=" --with-appdefaultdir=/etc/X11/app-defaults" &&
+
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/xorg7/extra/xterm/BUILD b/xorg7/extra/xterm/BUILD
index bfbddc2..10cdc05 100644
--- a/xorg7/extra/xterm/BUILD
+++ b/xorg7/extra/xterm/BUILD
@@ -7,14 +7,14 @@
   # And to put icons in /usr/share/icons/
   sedit "s:@icondir@:/usr/share/icons:1" Makefile.in  &&
 
-  OPTS+=" --with-app-defaults=/usr/lib/X11/app-defaults"  &&
+  OPTS+=" --with-app-defaults=/etc/X11/app-defaults"  &&
 
   default_build  &&
 
   # cosmetic but needed adjustments:
-  if ! grep -q 'XTerm*loginShell:' /usr/lib/X11/app-defaults/XTerm ; then
-    echo 'XTerm*loginShell: true' >> /usr/lib/X11/app-defaults/XTerm  &&
-    echo 'XTerm*loginShell: true' >> /usr/lib/X11/app-defaults/XTerm-color
+  if ! grep -q 'XTerm*loginShell:' /etc/X11/app-defaults/XTerm ; then
+    echo 'XTerm*loginShell: true' >> /etc/X11/app-defaults/XTerm  &&
+    echo 'XTerm*loginShell: true' >> /etc/X11/app-defaults/XTerm-color
   fi  &&
 
   install -Dm 644 {,/usr/share/applications/}xterm.desktop