aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Välimaa <wally@mageia.org>2012-07-01 15:03:04 +0000
committerJani Välimaa <wally@mageia.org>2012-07-01 15:03:04 +0000
commitadc718b46e1cf9238dfaba11ca52736857b73c6e (patch)
tree8eee4a944361611516fe686b5ed98e9ac5ce6cae
parent415f9328f191c127acbd34ba5ab8caf152376c7f (diff)
downloadconfig-adc718b46e1cf9238dfaba11ca52736857b73c6e.tar
config-adc718b46e1cf9238dfaba11ca52736857b73c6e.tar.gz
config-adc718b46e1cf9238dfaba11ca52736857b73c6e.tar.bz2
config-adc718b46e1cf9238dfaba11ca52736857b73c6e.tar.xz
config-adc718b46e1cf9238dfaba11ca52736857b73c6e.zip
adapt Makefile for only one XFCE flavour
-rw-r--r--Default/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml41
-rw-r--r--Makefile13
2 files changed, 4 insertions, 50 deletions
diff --git a/Default/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/Default/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
deleted file mode 100644
index 443d7c1..0000000
--- a/Default/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xsettings" version="1.0">
- <property name="Net" type="empty">
- <property name="DoubleClickTime" type="int" value="250"/>
- <property name="DoubleClickDistance" type="int" value="5"/>
- <property name="DndDragThreshold" type="int" value="8"/>
- <property name="CursorBlink" type="bool" value="true"/>
- <property name="CursorBlinkTime" type="int" value="1200"/>
- <property name="ThemeName" type="string" value="oxygen-gtk"/>
- <property name="IconThemeName" type="string" value="Oxygen"/>
- <property name="SoundThemeName" type="string" value="default"/>
- <property name="EnableEventSounds" type="bool" value="true"/>
- <property name="EnableInputFeedbackSounds" type="bool" value="true"/>
- </property>
- <property name="Xft" type="empty">
- <property name="Antialias" type="int" value="1"/>
- <property name="Hinting" type="int" value="-1"/>
- <property name="HintStyle" type="string" value="hintslight"/>
- <property name="RGBA" type="string" value="none"/>
- <property name="DPI" type="int" value="96"/>
- </property>
- <property name="Gtk" type="empty">
- <property name="CanChangeAccels" type="bool" value="false"/>
- <property name="ColorPalette" type="string" value="black:white:gray50:red:purple:blue:light blue:green:yellow:orange:lavender:brown:goldenrod4:dodger blue:pink:light green:gray10:gray30:gray75:gray90"/>
- <property name="FontName" type="string" value="Sans 10"/>
- <property name="IconSizes" type="string" value=""/>
- <property name="KeyThemeName" type="string" value=""/>
- <property name="ToolbarStyle" type="string" value="both"/>
- <property name="ToolbarIconSize" type="int" value="3"/>
- <property name="IMPreeditStyle" type="string" value=""/>
- <property name="IMStatusStyle" type="string" value=""/>
- <property name="MenuImages" type="bool" value="true"/>
- <property name="ButtonImages" type="bool" value="true"/>
- <property name="MenuBarAccel" type="string" value="F10"/>
- <property name="CursorThemeName" type="string" value="wonderland"/>
- <property name="CursorThemeSize" type="int" value="0"/>
- </property>
- <property name="Initialized" type="uint" value="1"/>
- <property name="NetCursorBlinkTime" type="int" value="1000"/>
-</channel>
diff --git a/Makefile b/Makefile
index a35dea3..dae1680 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,12 @@
# ahmadsamir3891@gmail.com
# wally@mageia.org
+include Makefile.config
+
PACKAGE = mageia-xfce-config
VERSION = `date +%Y%m%d`
-PREFIX=$(prefix)
xfceconfdir=$(sysconfdir)
-xfceprofdir=$(localstatedir)/mageia/xfce-profiles
install:
-install -d $(DESTDIR)$(xfceconfdir)
@@ -27,19 +27,14 @@ install:
-install -d $(DESTDIR)$(xfceconfdir)/xfce4/theme
# -install -d $(DESTDIR)$(xfceconfdir)/xfce4/volstatus
-install -d $(DESTDIR)$(xfceconfdir)/xfce4/xfconf/xfce-perchannel-xml
- -install -d $(DESTDIR)$(PREFIX)/bin
+ -install -d $(DESTDIR)$(prefix)/bin
cp -pr common/xfce4/panel/* $(DESTDIR)$(xfceconfdir)/xfce4/panel/
install -m 644 common/xfce4/theme/* $(DESTDIR)$(xfceconfdir)/xfce4/theme/
# install -m 644 common/xfce4/volstatus/* $(DESTDIR)$(xfceconfdir)/xfce4/volstatus/
install -m 644 common/xfce4/xfconf/xfce-perchannel-xml/* $(DESTDIR)$(xfceconfdir)/xfce4/xfconf/xfce-perchannel-xml/
install -m 644 common/xfce4/*.rc $(DESTDIR)$(xfceconfdir)/xfce4
install -m 644 common/xfce4/*.xrdb $(DESTDIR)$(xfceconfdir)/xfce4
- install -m 755 tools/xfce4-firstrun $(DESTDIR)$(PREFIX)/bin
-
- -install -d $(DESTDIR)$(xfceprofdir)
- -install -d $(DESTDIR)$(xfceprofdir)/Default/xfce4/xfconf/xfce-perchannel-xml
-
- install -m 644 Default/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml $(DESTDIR)$(xfceprofdir)/Default/xfce4/xfconf/xfce-perchannel-xml
+ install -m 755 tools/xfce4-firstrun $(DESTDIR)$(prefix)/bin
cleandist:
rm -rf $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION).tar.xz