Fix Makefile to set always the right permissions during installation

helmuthdu · Aug 6, 2015 · 9326003 · 9326003
1 parent fa637f5
commit 9326003
Show file tree

Hide file tree

Showing 163 changed files with 6 additions and 8 deletions.
diff --git a/AUTHORS b/AUTHORS
diff --git a/COPYING b/COPYING
diff --git a/ChangeLog b/ChangeLog
diff --git a/Makefile b/Makefile
@@ -9,15 +9,13 @@ conky-colors: conky-colors.c conkycover.c conkyplayer.c \
 	confinstall.c utils.c initialize.c
 
 install: conky-colors conkyrc
-	mkdir -p $(DESTDIR)/usr/share
-	mkdir -p $(DESTDIR)/usr/bin
-	cp -v conky-colors $(DESTDIR)/usr/bin
-	cp -v -r conkycolors $(DESTDIR)/usr/share
-	cp -v -r fonts/conkycolors $(DESTDIR)/usr/share/fonts
+	install -Dm755 conky-colors $(DESTDIR)/bin/conky-colors
+	find conkycolors/bin -type f -exec install -Dm755 {} $(DESTDIR)/usr/share/{} \;
+	find conkycolors/scripts -type f -exec install -Dm755 {} $(DESTDIR)/usr/share/{} \;
+	find conkycolors/icons -type f -exec install -Dm644 {} $(DESTDIR)/usr/share/{} \;
+	find conkycolors/templates -type f -exec install -Dm644 {} $(DESTDIR)/usr/share/{} \;
+	find fonts/conkycolors -type f -exec install -Dm644 {} $(DESTDIR)/usr/share/{} \;
 	ln -fs $(DESTDIR)/usr/share/conkycolors/bin/conkyTask $(DESTDIR)/usr/bin/ct
-	chmod +x $(DESTDIR)/usr/share/conkycolors/scripts/*
-	chmod +x $(DESTDIR)/usr/share/conkycolors/bin/*
-	chmod -R 755 $(DESTDIR)/usr/share/conkycolors/
 
 conkyrc: conky-colors
 

diff --git a/README.md b/README.md
diff --git a/conkycolors/icons/CD/base.png b/conkycolors/icons/CD/base.png
diff --git a/conkycolors/icons/CD/top.png b/conkycolors/icons/CD/top.png
diff --git a/conkycolors/icons/Case/base.png b/conkycolors/icons/Case/base.png
diff --git a/conkycolors/icons/Case/top.png b/conkycolors/icons/Case/top.png
diff --git a/conkycolors/icons/ConkyPhoto/empty.png b/conkycolors/icons/ConkyPhoto/empty.png
diff --git a/conkycolors/icons/ConkyPhoto/photobg_bg_big.png b/conkycolors/icons/ConkyPhoto/photobg_bg_big.png
diff --git a/conkycolors/icons/ConkyPhoto/photobg_bg_medium.png b/conkycolors/icons/ConkyPhoto/photobg_bg_medium.png
diff --git a/conkycolors/icons/ConkyPhoto/photobg_bg_small.png b/conkycolors/icons/ConkyPhoto/photobg_bg_small.png
diff --git a/conkycolors/icons/ConkyPhoto/photobg_shadow_big.png b/conkycolors/icons/ConkyPhoto/photobg_shadow_big.png
diff --git a/conkycolors/icons/ConkyPhoto/photobg_shadow_medium.png b/conkycolors/icons/ConkyPhoto/photobg_shadow_medium.png
diff --git a/conkycolors/icons/ConkyPhoto/photobg_shadow_small.png b/conkycolors/icons/ConkyPhoto/photobg_shadow_small.png
diff --git a/conkycolors/icons/Glassy/base.png b/conkycolors/icons/Glassy/base.png
diff --git a/conkycolors/icons/Glassy/top.png b/conkycolors/icons/Glassy/top.png
diff --git a/conkycolors/icons/Players/banshee.png b/conkycolors/icons/Players/banshee.png
diff --git a/conkycolors/icons/Players/exaile.png b/conkycolors/icons/Players/exaile.png
diff --git a/conkycolors/icons/Players/rhythmbox.png b/conkycolors/icons/Players/rhythmbox.png
diff --git a/conkycolors/icons/SLS/Cover.png b/conkycolors/icons/SLS/Cover.png
diff --git a/conkycolors/icons/SLS/Cover.svg b/conkycolors/icons/SLS/Cover.svg
diff --git a/conkycolors/icons/SLS/Cover_White.svg b/conkycolors/icons/SLS/Cover_White.svg
diff --git a/conkycolors/icons/SLS/Cover_white.png b/conkycolors/icons/SLS/Cover_white.png
diff --git a/conkycolors/icons/Vinyl/base.png b/conkycolors/icons/Vinyl/base.png
diff --git a/conkycolors/icons/Vinyl/top.png b/conkycolors/icons/Vinyl/top.png
diff --git a/conkycolors/icons/Weather/0.png b/conkycolors/icons/Weather/0.png
diff --git a/conkycolors/icons/Weather/1.png b/conkycolors/icons/Weather/1.png
diff --git a/conkycolors/icons/Weather/10.png b/conkycolors/icons/Weather/10.png
diff --git a/conkycolors/icons/Weather/11.png b/conkycolors/icons/Weather/11.png
diff --git a/conkycolors/icons/Weather/12.png b/conkycolors/icons/Weather/12.png
diff --git a/conkycolors/icons/Weather/13.png b/conkycolors/icons/Weather/13.png
diff --git a/conkycolors/icons/Weather/14.png b/conkycolors/icons/Weather/14.png
diff --git a/conkycolors/icons/Weather/15.png b/conkycolors/icons/Weather/15.png
diff --git a/conkycolors/icons/Weather/16.png b/conkycolors/icons/Weather/16.png
diff --git a/conkycolors/icons/Weather/17.png b/conkycolors/icons/Weather/17.png
diff --git a/conkycolors/icons/Weather/18.png b/conkycolors/icons/Weather/18.png
diff --git a/conkycolors/icons/Weather/19.png b/conkycolors/icons/Weather/19.png
diff --git a/conkycolors/icons/Weather/2.png b/conkycolors/icons/Weather/2.png
diff --git a/conkycolors/icons/Weather/20.png b/conkycolors/icons/Weather/20.png
diff --git a/conkycolors/icons/Weather/21.png b/conkycolors/icons/Weather/21.png
diff --git a/conkycolors/icons/Weather/22.png b/conkycolors/icons/Weather/22.png
diff --git a/conkycolors/icons/Weather/23.png b/conkycolors/icons/Weather/23.png
diff --git a/conkycolors/icons/Weather/24.png b/conkycolors/icons/Weather/24.png
diff --git a/conkycolors/icons/Weather/25.png b/conkycolors/icons/Weather/25.png
diff --git a/conkycolors/icons/Weather/26.png b/conkycolors/icons/Weather/26.png
diff --git a/conkycolors/icons/Weather/27.png b/conkycolors/icons/Weather/27.png
diff --git a/conkycolors/icons/Weather/28.png b/conkycolors/icons/Weather/28.png
diff --git a/conkycolors/icons/Weather/29.png b/conkycolors/icons/Weather/29.png
diff --git a/conkycolors/icons/Weather/3.png b/conkycolors/icons/Weather/3.png
diff --git a/conkycolors/icons/Weather/30.png b/conkycolors/icons/Weather/30.png
diff --git a/conkycolors/icons/Weather/31.png b/conkycolors/icons/Weather/31.png
diff --git a/conkycolors/icons/Weather/32.png b/conkycolors/icons/Weather/32.png
diff --git a/conkycolors/icons/Weather/33.png b/conkycolors/icons/Weather/33.png
diff --git a/conkycolors/icons/Weather/34.png b/conkycolors/icons/Weather/34.png
diff --git a/conkycolors/icons/Weather/35.png b/conkycolors/icons/Weather/35.png
diff --git a/conkycolors/icons/Weather/36.png b/conkycolors/icons/Weather/36.png
diff --git a/conkycolors/icons/Weather/37.png b/conkycolors/icons/Weather/37.png
diff --git a/conkycolors/icons/Weather/38.png b/conkycolors/icons/Weather/38.png
diff --git a/conkycolors/icons/Weather/39.png b/conkycolors/icons/Weather/39.png
diff --git a/conkycolors/icons/Weather/4.png b/conkycolors/icons/Weather/4.png
diff --git a/conkycolors/icons/Weather/40.png b/conkycolors/icons/Weather/40.png
diff --git a/conkycolors/icons/Weather/41.png b/conkycolors/icons/Weather/41.png
diff --git a/conkycolors/icons/Weather/42.png b/conkycolors/icons/Weather/42.png
diff --git a/conkycolors/icons/Weather/43.png b/conkycolors/icons/Weather/43.png
diff --git a/conkycolors/icons/Weather/44.png b/conkycolors/icons/Weather/44.png
diff --git a/conkycolors/icons/Weather/45.png b/conkycolors/icons/Weather/45.png
diff --git a/conkycolors/icons/Weather/46.png b/conkycolors/icons/Weather/46.png
diff --git a/conkycolors/icons/Weather/47.png b/conkycolors/icons/Weather/47.png
diff --git a/conkycolors/icons/Weather/5.png b/conkycolors/icons/Weather/5.png
diff --git a/conkycolors/icons/Weather/6.png b/conkycolors/icons/Weather/6.png
diff --git a/conkycolors/icons/Weather/7.png b/conkycolors/icons/Weather/7.png
diff --git a/conkycolors/icons/Weather/8.png b/conkycolors/icons/Weather/8.png
diff --git a/conkycolors/icons/Weather/9.png b/conkycolors/icons/Weather/9.png
diff --git a/conkycolors/icons/WeatherAlt/0.png b/conkycolors/icons/WeatherAlt/0.png
diff --git a/conkycolors/icons/WeatherAlt/1.png b/conkycolors/icons/WeatherAlt/1.png
diff --git a/conkycolors/icons/WeatherAlt/10.png b/conkycolors/icons/WeatherAlt/10.png
diff --git a/conkycolors/icons/WeatherAlt/11.png b/conkycolors/icons/WeatherAlt/11.png
diff --git a/conkycolors/icons/WeatherAlt/12.png b/conkycolors/icons/WeatherAlt/12.png
diff --git a/conkycolors/icons/WeatherAlt/13.png b/conkycolors/icons/WeatherAlt/13.png
diff --git a/conkycolors/icons/WeatherAlt/14.png b/conkycolors/icons/WeatherAlt/14.png
diff --git a/conkycolors/icons/WeatherAlt/15.png b/conkycolors/icons/WeatherAlt/15.png
diff --git a/conkycolors/icons/WeatherAlt/16.png b/conkycolors/icons/WeatherAlt/16.png
diff --git a/conkycolors/icons/WeatherAlt/17.png b/conkycolors/icons/WeatherAlt/17.png
diff --git a/conkycolors/icons/WeatherAlt/18.png b/conkycolors/icons/WeatherAlt/18.png
diff --git a/conkycolors/icons/WeatherAlt/19.png b/conkycolors/icons/WeatherAlt/19.png
diff --git a/conkycolors/icons/WeatherAlt/2.png b/conkycolors/icons/WeatherAlt/2.png
diff --git a/conkycolors/icons/WeatherAlt/20.png b/conkycolors/icons/WeatherAlt/20.png
diff --git a/conkycolors/icons/WeatherAlt/21.png b/conkycolors/icons/WeatherAlt/21.png
diff --git a/conkycolors/icons/WeatherAlt/22.png b/conkycolors/icons/WeatherAlt/22.png
diff --git a/conkycolors/icons/WeatherAlt/23.png b/conkycolors/icons/WeatherAlt/23.png
diff --git a/conkycolors/icons/WeatherAlt/24.png b/conkycolors/icons/WeatherAlt/24.png
diff --git a/conkycolors/icons/WeatherAlt/25.png b/conkycolors/icons/WeatherAlt/25.png
diff --git a/conkycolors/icons/WeatherAlt/26.png b/conkycolors/icons/WeatherAlt/26.png
diff --git a/conkycolors/icons/WeatherAlt/27.png b/conkycolors/icons/WeatherAlt/27.png
diff --git a/conkycolors/icons/WeatherAlt/28.png b/conkycolors/icons/WeatherAlt/28.png
diff --git a/conkycolors/icons/WeatherAlt/29.png b/conkycolors/icons/WeatherAlt/29.png
diff --git a/conkycolors/icons/WeatherAlt/3.png b/conkycolors/icons/WeatherAlt/3.png
diff --git a/conkycolors/icons/WeatherAlt/30.png b/conkycolors/icons/WeatherAlt/30.png
diff --git a/conkycolors/icons/WeatherAlt/31.png b/conkycolors/icons/WeatherAlt/31.png
diff --git a/conkycolors/icons/WeatherAlt/32.png b/conkycolors/icons/WeatherAlt/32.png
diff --git a/conkycolors/icons/WeatherAlt/33.png b/conkycolors/icons/WeatherAlt/33.png
diff --git a/conkycolors/icons/WeatherAlt/34.png b/conkycolors/icons/WeatherAlt/34.png
diff --git a/conkycolors/icons/WeatherAlt/35.png b/conkycolors/icons/WeatherAlt/35.png
diff --git a/conkycolors/icons/WeatherAlt/37.png b/conkycolors/icons/WeatherAlt/37.png
diff --git a/conkycolors/icons/WeatherAlt/38.png b/conkycolors/icons/WeatherAlt/38.png
diff --git a/conkycolors/icons/WeatherAlt/39.png b/conkycolors/icons/WeatherAlt/39.png
diff --git a/conkycolors/icons/WeatherAlt/4.png b/conkycolors/icons/WeatherAlt/4.png
diff --git a/conkycolors/icons/WeatherAlt/40.png b/conkycolors/icons/WeatherAlt/40.png
diff --git a/conkycolors/icons/WeatherAlt/41.png b/conkycolors/icons/WeatherAlt/41.png
diff --git a/conkycolors/icons/WeatherAlt/42.png b/conkycolors/icons/WeatherAlt/42.png
diff --git a/conkycolors/icons/WeatherAlt/43.png b/conkycolors/icons/WeatherAlt/43.png
diff --git a/conkycolors/icons/WeatherAlt/44.png b/conkycolors/icons/WeatherAlt/44.png
diff --git a/conkycolors/icons/WeatherAlt/45.png b/conkycolors/icons/WeatherAlt/45.png
diff --git a/conkycolors/icons/WeatherAlt/46.png b/conkycolors/icons/WeatherAlt/46.png
diff --git a/conkycolors/icons/WeatherAlt/47.png b/conkycolors/icons/WeatherAlt/47.png
diff --git a/conkycolors/icons/WeatherAlt/5.png b/conkycolors/icons/WeatherAlt/5.png
diff --git a/conkycolors/icons/WeatherAlt/6.png b/conkycolors/icons/WeatherAlt/6.png
diff --git a/conkycolors/icons/WeatherAlt/7.png b/conkycolors/icons/WeatherAlt/7.png
diff --git a/conkycolors/icons/WeatherAlt/8.png b/conkycolors/icons/WeatherAlt/8.png
diff --git a/conkycolors/icons/WeatherAlt/9.png b/conkycolors/icons/WeatherAlt/9.png
diff --git a/conkycolors/icons/oldVinyl/base.png b/conkycolors/icons/oldVinyl/base.png
diff --git a/conkycolors/icons/oldVinyl/top.png b/conkycolors/icons/oldVinyl/top.png
diff --git a/conkycolors/templates/conkyPlayer.template b/conkycolors/templates/conkyPlayer.template
diff --git a/fonts/conkycolors/Digirtu.ttf b/fonts/conkycolors/Digirtu.ttf
diff --git a/fonts/conkycolors/Piechartsformaps.ttf b/fonts/conkycolors/Piechartsformaps.ttf
diff --git a/src/confinstall.c b/src/confinstall.c
diff --git a/src/confinstall.h b/src/confinstall.h
diff --git a/src/conky-colors.c b/src/conky-colors.c
diff --git a/src/conkycover.c b/src/conkycover.c
diff --git a/src/conkycover.h b/src/conkycover.h
diff --git a/src/conkyplayer.c b/src/conkyplayer.c
diff --git a/src/conkyplayer.h b/src/conkyplayer.h
diff --git a/src/conkyrc_board.c b/src/conkyrc_board.c
diff --git a/src/conkyrc_board.h b/src/conkyrc_board.h
diff --git a/src/conkyrc_cairo.c b/src/conkyrc_cairo.c
diff --git a/src/conkyrc_cairo.h b/src/conkyrc_cairo.h
diff --git a/src/conkyrc_default.h b/src/conkyrc_default.h
diff --git a/src/conkyrc_ring.c b/src/conkyrc_ring.c
diff --git a/src/conkyrc_ring.h b/src/conkyrc_ring.h
diff --git a/src/conkyrc_slim.c b/src/conkyrc_slim.c
diff --git a/src/conkyrc_slim.h b/src/conkyrc_slim.h
diff --git a/src/conkyrc_sls.c b/src/conkyrc_sls.c
diff --git a/src/conkyrc_sls.h b/src/conkyrc_sls.h
diff --git a/src/coverposition.c b/src/coverposition.c
diff --git a/src/coverposition.h b/src/coverposition.h
diff --git a/src/finddir.c b/src/finddir.c
diff --git a/src/finddir.h b/src/finddir.h
diff --git a/src/help.c b/src/help.c
diff --git a/src/help.h b/src/help.h
diff --git a/src/initialize.c b/src/initialize.c
diff --git a/src/initialize.h b/src/initialize.h
diff --git a/src/options.c b/src/options.c
diff --git a/src/options.h b/src/options.h
diff --git a/src/photoposition.c b/src/photoposition.c
diff --git a/src/photoposition.h b/src/photoposition.h
diff --git a/src/themes.c b/src/themes.c
diff --git a/src/themes.h b/src/themes.h
diff --git a/src/utils.c b/src/utils.c
diff --git a/src/utils.h b/src/utils.h
diff --git a/src/variables.c b/src/variables.c
diff --git a/src/variables.h b/src/variables.h