From d0ebdea628307f0504f6998aa2467c78bedb85ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Sat, 2 May 2015 10:30:45 +0200
Subject: Split JPG generation out of the "install" section

---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index f188949..af6b347 100644
--- a/Makefile
+++ b/Makefile
@@ -9,17 +9,16 @@ libexecdir=/usr/libexec
 sharedir=/usr/share
 unitdir=/usr/lib/systemd/system
 
-all:
+all: scripts
 
-install:
-	@mkdir -p $(DESTDIR)$(sharedir)/mga/backgrounds/
+scripts:
 	@/bin/cp -f gimp/scripts/gimp-normalize-to-bootsplash.scm tmp-gimp-command
 	@cat gimp/scripts/gimp-convert-to-jpeg.scm >> tmp-gimp-command
 	@for i in */gfxboot/*.png ; do \
 	    echo \(gimp-normalize-to-bootsplash 1.0 \"$$i\" \"`dirname $$i`/`basename $$i .png`.jpg\"\) >> tmp-gimp-command; \
 	done
 	@for i in */background/*.png ; do \
-            echo \(gimp-convert-to-jpeg 0.98 \"$$i\" \"$(DESTDIR)$(sharedir)/mga/backgrounds/`basename $$i .png`.jpg\"\) >> tmp-gimp-command; \
+	     echo \(gimp-convert-to-jpeg 0.98 \"$$i\" \"`dirname $$i`/`basename $$i .png`.jpg\"\) >> tmp-gimp-command; \
 	done
 	@echo \(gimp-quit 1\) >> tmp-gimp-command
 	@echo running gimp to convert images
@@ -28,11 +27,12 @@ install:
 #	GIMP2_DIRECTORY=`pwd`/gimp gimp  --console-messages -i -d  -b '(begin (gimp-normalize-to-bootsplash-dirs "1.0" "*" "bootsplash/data/*.png") (gimp-quit 1))'
 #	GIMP2_DIRECTORY=`pwd`/gimp gimp --console-messages -i -d -b '(begin (gimp-normalize-to-bootsplash-dirs "1.0" "*" "gfxboot/*.png") (gimp-quit 1))'
 
+install:
 	mkdir -p $(DESTDIR)$(sharedir)/mga/screensaver
 	mkdir -p $(DESTDIR)$(sharedir)/mga/backgrounds
 	install -m 644 common/screensaver/*.jpg $(DESTDIR)$(sharedir)/mga/screensaver
 	install -m 644 extra-backgrounds/*.jpg $(DESTDIR)$(sharedir)/mga/backgrounds
-#	install -m644 */background/*.jpg $(DESTDIR)$(sharedir)/mga/backgrounds 
+	install -m644 */background/*.jpg $(DESTDIR)$(sharedir)/mga/backgrounds
 	@for t in $(THEMES); do \
           set -x; set -e; \
 	  install -d $(DESTDIR)$(sharedir)/plymouth/themes/$$t; \
-- 
cgit v1.2.1