From 9516852b146a1e1376c9011dcf5308cbdafc89d8 Mon Sep 17 00:00:00 2001 From: Falk Stern Date: Fri, 27 May 2011 23:35:47 +0200 Subject: [PATCH 1/2] Added $(DESTDIR) to install target, makes packaging easier --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 64a3dc88..1396486d 100644 --- a/Makefile +++ b/Makefile @@ -18,10 +18,10 @@ clean: prefix=/usr/local -install: hairtunes - install -m 0755 hairtunes $(prefix)/bin - install -m 0755 shairport.pl $(prefix)/bin - install -m 0755 shairport $(prefix)/bin +install: hairtunes shairport + install -m 0755 hairtunes $(DESTDIR)$(prefix)/bin + install -m 0755 shairport.pl $(DESTDIR)$(prefix)/bin + install -m 0755 shairport $(DESTDIR)$(prefix)/bin .PTHONY: all clean install From 16b349690e07eca6f099c328a2ad279f67f33034 Mon Sep 17 00:00:00 2001 From: Falk Stern Date: Sat, 28 May 2011 00:18:06 +0200 Subject: [PATCH 2/2] Some fixes on the install target --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1396486d..767ce191 100644 --- a/Makefile +++ b/Makefile @@ -19,9 +19,9 @@ clean: prefix=/usr/local install: hairtunes shairport - install -m 0755 hairtunes $(DESTDIR)$(prefix)/bin - install -m 0755 shairport.pl $(DESTDIR)$(prefix)/bin - install -m 0755 shairport $(DESTDIR)$(prefix)/bin + install -D -m 0755 hairtunes $(DESTDIR)$(prefix)/bin/hairtunes + install -D -m 0755 shairport.pl $(DESTDIR)$(prefix)/bin/shairport.pl + install -D -m 0755 shairport $(DESTDIR)$(prefix)/bin/shairport .PTHONY: all clean install