summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile9
-rw-r--r--mga-bg-res/Makefile27
-rw-r--r--mga-bg-res/NEWS1
3 files changed, 9 insertions, 28 deletions
diff --git a/Makefile b/Makefile
index 3969ad7..16f5018 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,10 @@ VERSION=1.5.0.42
THEMES=Mageia-Default
FILES=$(THEMES) Makefile common gimp extra-backgrounds
-sharedir=/usr/share
configdir=/etc
+libexecdir=/usr/libexec
+sharedir=/usr/share
+unitdir=/usr/lib/systemd/system
SVNSOFT=svn+ssh://svn.mageia.org/svn/soft/theme/mageia-theme/
SVNNAME=svn+ssh://svn.mageia.org/svn/packages/cauldron/mageia-theme/current/
@@ -47,6 +49,11 @@ install:
install -m644 $$t/gfxboot/*.jpg $(prefix)$(sharedir)/gfxboot/themes/$$t/; \
done
+ @mkdir -p $(prefix)$(libexecdir)
+ install -m755 mga-bg-res/mga-bg-res.sh $(prefix)$(libexecdir)/mga-bg-res
+ @mkdir -p $(prefix)$(unitdir)
+ install -m644 mga-bg-res/mga-bg-res.service $(prefix)$(unitdir)/mga-bg-res.service
+
changelog:
svn2cl --authors ../common/username.xml --accum
rm -f ChangeLog.bak
diff --git a/mga-bg-res/Makefile b/mga-bg-res/Makefile
deleted file mode 100644
index d533791..0000000
--- a/mga-bg-res/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-VERSION:=$(shell cat VERSION)
-
-mga-bg-res:
- gcc -O2 -g -Wall -o mga-bg-res mga-bg-res.c
-
-install:
- mkdir -p $(DESTDIR)/usr/bin/
- cp mga-bg-res $(DESTDIR)/usr/bin/
- chmod u+s $(DESTDIR)/usr/bin/mga-bg-res
- mkdir -p $(DESTDIR)/etc/X11/xinit.d/
- cp mga-bg-res.xinit $(DESTDIR)/etc/X11/xinit.d/01mga-bg-res
-
-uninstall:
- rm -f $(DESTDIR)/usr/bin/mga-bg-res
- rm -f $(DESTDIR)/etc/X11/xinit.d/01mga-bg-res
-
-dist:
- mkdir mga-bg-res-$(VERSION)
- cp mga-bg-res.c mga-bg-res-$(VERSION)/
- cp mga-bg-res.xinit mga-bg-res-$(VERSION)/
- cp Makefile mga-bg-res-$(VERSION)/
- cp VERSION mga-bg-res-$(VERSION)/
- tar caf mga-bg-res-$(VERSION).tar.xz mga-bg-res-$(VERSION)
- rm -rf mga-bg-res-$(VERSION)
-
-clean:
- rm -f mga-bg-res
diff --git a/mga-bg-res/NEWS b/mga-bg-res/NEWS
index ead83b4..6ee748f 100644
--- a/mga-bg-res/NEWS
+++ b/mga-bg-res/NEWS
@@ -1,6 +1,7 @@
- Make mga-bg-res a systemd service
- Uses monitor-probe to find the optimal resolution when X is not yet started
- Handle cases where monitor-probe fails by defaulting to 4:3 aspect ratio
+- Package mga-bg-res directly in mageia-theme
Version 0.6 (2015-04-22):
- xinit script: Work also when default.jpg symlink is missing