diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2015-05-02 10:01:50 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2015-05-02 10:01:50 +0200 |
| commit | c09b326a7b13a036495408232f12ed42836d9dc7 (patch) | |
| tree | de9bc363ca0c4e5c9f8660ca35d41e47aca09029 | |
| parent | 5682ab44e3ecca0a18404885bcfbf97b8762a89b (diff) | |
| download | theme-c09b326a7b13a036495408232f12ed42836d9dc7.tar theme-c09b326a7b13a036495408232f12ed42836d9dc7.tar.gz theme-c09b326a7b13a036495408232f12ed42836d9dc7.tar.bz2 theme-c09b326a7b13a036495408232f12ed42836d9dc7.tar.xz theme-c09b326a7b13a036495408232f12ed42836d9dc7.zip | |
Install mga-bg-res via the main Makefile, so that it can be packaged in mageia-theme
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | mga-bg-res/Makefile | 27 | ||||
| -rw-r--r-- | mga-bg-res/NEWS | 1 |
3 files changed, 9 insertions, 28 deletions
@@ -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 |