From ea00c2fc6d91d71b8cf3c8408af8ca8de7c037a6 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@derf.homelinux.org>
Date: Sat, 27 Mar 2010 12:16:01 +0100
Subject: Makefile/config.mk: Support getting the usual values from the
 environment.

No need to edit config.mk to set addictional CFLAGS/LDFLAGS or change the DESTDIR etc. now
---
 Makefile | 71 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a5bc3f0..a409c36 100644
--- a/Makefile
+++ b/Makefile
@@ -1,62 +1,63 @@
 include config.mk
 
 default:
-	@$(MAKE) -C src
+	@${MAKE} -C src
 
 install: install-man install-doc install-bin install-font install-img
 
 install-man:
-	@echo installing manuals to $(man_dir)
-	@mkdir -p $(man_dir)/man1
-	@cp man/feh.1 man/feh-cam.1 $(man_dir)/man1
+	@echo installing manuals to ${man_dir}
+	@mkdir -p ${man_dir}/man1
+	@cp man/feh.1 man/feh-cam.1 ${man_dir}/man1
 	@chmod 644 $(man_dir)/man1/feh.1 $(man_dir)/man1/feh-cam.1
 	@ln -fs feh-cam.1 $(man_dir)/man1/gen-cam-menu.1
 
 install-doc:
-	@echo installing docs to $(doc_dir)
-	@mkdir -p $(doc_dir)/feh
-	@cp AUTHORS ChangeLog README TODO $(doc_dir)/feh
-	@chmod 644 $(doc_dir)/feh/AUTHORS $(doc_dir)/feh/ChangeLog \
-		$(doc_dir)/feh/README  $(doc_dir)/feh/TODO
+	@echo installing docs to ${doc_dir}
+	@mkdir -p ${doc_dir}/feh
+	@cp AUTHORS ChangeLog README TODO ${doc_dir}/feh
+	@chmod 644 ${doc_dir}/feh/AUTHORS ${doc_dir}/feh/ChangeLog \
+		${doc_dir}/feh/README ${doc_dir}/feh/TODO
 
 install-bin:
-	@echo installing executables to $(bin_dir)
-	@mkdir -p $(bin_dir)
-	@cp src/feh cam/feh-cam cam/gen-cam-menu $(bin_dir)
-	@chmod 755 $(bin_dir)/feh $(bin_dir)/feh-cam \
-		$(bin_dir)/gen-cam-menu
+	@echo installing executables to ${bin_dir}
+	@mkdir -p ${bin_dir}
+	@cp src/feh cam/feh-cam cam/gen-cam-menu ${bin_dir}
+	@chmod 755 ${bin_dir}/feh ${bin_dir}/feh-cam \
+		${bin_dir}/gen-cam-menu
 
 install-font:
-	@echo installing fonts to $(font_dir)
-	@mkdir -p $(font_dir)
+	@echo installing fonts to ${font_dir}
+	@mkdir -p ${font_dir}
 	@cp src/ttfonts/black.style src/ttfonts/menu.style \
-		src/ttfonts/yudit.ttf $(font_dir)
-	@chmod 644 $(font_dir)/black.style $(font_dir)/menu.style \
-		$(font_dir)/yudit.ttf
+		src/ttfonts/yudit.ttf ${font_dir}
+	@chmod 644 ${font_dir}/black.style ${font_dir}/menu.style \
+		${font_dir}/yudit.ttf
 
 install-img:
-	@echo installing images to $(image_dir)
-	@mkdir -p $(image_dir)
+	@echo installing images to ${image_dir}
+	@mkdir -p ${image_dir}
 	@cp src/about.png src/menubg_aluminium.png src/menubg_aqua.png \
 		src/menubg_black.png src/menubg_brushed.png src/menubg_chrome.png \
 		src/menubg_default.png src/menubg_pastel.png src/menubg_sky.png \
-		src/menubg_wood.png $(image_dir)
-	@chmod 644 $(image_dir)/about.png $(image_dir)/menubg_aluminium.png \
-		$(image_dir)/menubg_aqua.png $(image_dir)/menubg_black.png \
-		$(image_dir)/menubg_brushed.png $(image_dir)/menubg_chrome.png \
-		$(image_dir)/menubg_default.png $(image_dir)/menubg_pastel.png \
-		$(image_dir)/menubg_sky.png $(image_dir)/menubg_wood.png
+		src/menubg_wood.png ${image_dir}
+	@chmod 644 ${image_dir}/about.png ${image_dir}/menubg_aluminium.png \
+		${image_dir}/menubg_aqua.png ${image_dir}/menubg_black.png \
+		${image_dir}/menubg_brushed.png ${image_dir}/menubg_chrome.png \
+		${image_dir}/menubg_default.png ${image_dir}/menubg_pastel.png \
+		${image_dir}/menubg_sky.png ${image_dir}/menubg_wood.png
 
 
 uninstall:
-	rm -f $(man_dir)/man1/feh.1 $(man_dir)/man1/feh-cam.1
-	rm -f $(man_dir)/man1/gen-cam-menu.1
-	rm -rf $(doc_dir)
-	rm -f $(bin_dir)/feh $(bin_dir)/feh-cam $(bin_dir)/gen-cam-menu
-	rm -rf $(font_dir)
-	rm -rf $(image_dir)
+	rm -f ${man_dir}/man1/feh.1 ${man_dir}/man1/feh-cam.1
+	rm -f ${man_dir}/man1/gen-cam-menu.1
+	rm -rf ${doc_dir}
+	rm -f ${bin_dir}/feh ${bin_dir}/feh-cam ${bin_dir}/gen-cam-menu
+	rm -rf ${font_dir}
+	rm -rf ${image_dir}
 
 clean:
-	@$(MAKE) -C src clean
+	@${MAKE} -C src clean
 
-.PHONY: default install uninstall clean
+.PHONY: default install uninstall clean install-man install-doc install-bin \
+	install-font install-img
-- 
cgit v1.2.3