From f941d7c923c97754da4bd35ad1a04a1523ee38e0 Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Fri, 30 Mar 2012 17:24:22 -0700 Subject: [PATCH] Clean up DESTDIR install behavior. --- mixer/doc/Makefile | 4 ++-- mixer/makefile.inc | 8 ++++---- sequencer/makefile.inc | 5 ++--- session-manager/doc/Makefile | 4 ++-- session-manager/makefile.inc | 8 ++++---- timeline/doc/Makefile | 4 ++-- timeline/makefile.inc | 9 ++++----- 7 files changed, 20 insertions(+), 22 deletions(-) diff --git a/mixer/doc/Makefile b/mixer/doc/Makefile index b4edd91..442d5cd 100644 --- a/mixer/doc/Makefile +++ b/mixer/doc/Makefile @@ -17,8 +17,8 @@ upload: all @ rm -f index.html install: - @ mkdir -p $(DOCUMENT_PATH)/non-mixer - @ cp $(OBJS) *.png mup.css ../../COPYING $(DOCUMENT_PATH)/non-mixer + @ install -d "$(DESTDIR)$(DOCUMENT_PATH)"/non-mixer + @ cp $(OBJS) *.png mup.css ../../COPYING "$(DESTDIR)$(DOCUMENT_PATH)"/non-mixer # @ ln -sf $(PIXMAP_PATH)/logo.png $(DOCUMENT_PATH) clean: diff --git a/mixer/makefile.inc b/mixer/makefile.inc index 560bee7..1937cfe 100644 --- a/mixer/makefile.inc +++ b/mixer/makefile.inc @@ -27,11 +27,11 @@ clean: install: all @ echo -n "Installing..." - @ install src/mixer "$(DESTDIR)$(prefix)"/bin/non-mixer - @ mkdir -p "$(DESTDIR)$(SYSTEM_PATH)"/non-mixer + @ install -Dm755 src/mixer "$(DESTDIR)$(prefix)"/bin/non-mixer + @ install -d "$(DESTDIR)$(SYSTEM_PATH)"/non-mixer @ $(MAKE) -s -C doc install @ install -d "$(DESTDIR)$(PIXMAP_PATH)/non-mixer" - @ install -m 644 icons/hicolor/256x256/apps/non-mixer.png "$(DESTDIR)$(PIXMAP_PATH)"/non-mixer/icon-256x256.png + @ install -Dm644 icons/hicolor/256x256/apps/non-mixer.png "$(DESTDIR)$(PIXMAP_PATH)"/non-mixer/icon-256x256.png @ install -d "$(DESTDIR)$(ICON_PATH)/hicolor" @ cp -au icons/hicolor/ "$(DESTDIR)$(ICON_PATH)" @ install -d "$(DESTDIR)$(DESKTOP_PATH)" @@ -39,6 +39,6 @@ install: all @ echo "$(DONE)" ifneq ($(USE_DEBUG),yes) @ echo -n "Stripping..." - @ strip $(DESTDIR)$(prefix)/bin/non-mixer + @ strip "$(DESTDIR)$(prefix)"/bin/non-mixer @ echo "$(DONE)" endif diff --git a/sequencer/makefile.inc b/sequencer/makefile.inc index 5b5a3a3..07e1165 100644 --- a/sequencer/makefile.inc +++ b/sequencer/makefile.inc @@ -38,8 +38,7 @@ endif install: all @ echo -n "Installing..." - @ install -d $(DESTDIR)$(prefix)/bin - @ install -m 755 src/sequencer $(DESTDIR)$(prefix)/bin/non-sequencer + @ install -Dm755 src/sequencer "$(DESTDIR)$(prefix)"/bin/non-sequencer @ install -d "$(DESTDIR)$(SYSTEM_PATH)/instruments" @ install -m 644 instruments/* "$(DESTDIR)$(SYSTEM_PATH)/instruments" @ $(MAKE) -s -C doc install @@ -52,7 +51,7 @@ install: all @ echo "$(DONE)" ifneq ($(USE_DEBUG),yes) @ echo -n "Stripping..." - @ strip $(DESTDIR)$(prefix)/bin/non-sequencer + @ strip "$(DESTDIR)$(prefix)"/bin/non-sequencer @ echo "$(DONE)" endif diff --git a/session-manager/doc/Makefile b/session-manager/doc/Makefile index c727c52..7d030b1 100644 --- a/session-manager/doc/Makefile +++ b/session-manager/doc/Makefile @@ -17,8 +17,8 @@ upload: all @ rm -f index.html install: - @ mkdir -p $(DOCUMENT_PATH)/non-session-manager - @ cp $(OBJS) *.png mup.css ../../COPYING $(DOCUMENT_PATH)/non-session-manager + @ install -d "$(DESTDIR)$(DOCUMENT_PATH)"/non-session-manager + @ cp $(OBJS) *.png mup.css ../../COPYING "$(DESTDIR)$(DOCUMENT_PATH)"/non-session-manager # @ ln -sf $(PIXMAP_PATH)/logo.png $(DOCUMENT_PATH) clean: diff --git a/session-manager/makefile.inc b/session-manager/makefile.inc index 89282b7..0c9330d 100644 --- a/session-manager/makefile.inc +++ b/session-manager/makefile.inc @@ -39,10 +39,10 @@ clean: install: all @ echo -n "Installing..." - @ install src/nsmd "$(DESTDIR)$(prefix)"/bin/nsmd - @ install src/session-manager "$(DESTDIR)$(prefix)"/bin/non-session-manager - @ install src/jackpatch "$(DESTDIR)$(prefix)"/bin/jackpatch - @ mkdir -p "$(DESTDIR)$(SYSTEM_PATH)"/non-session-manager + @ install -Dm755 src/nsmd "$(DESTDIR)$(prefix)"/bin/nsmd + @ install -Dm755 src/session-manager "$(DESTDIR)$(prefix)"/bin/non-session-manager + @ install -Dm755 src/jackpatch "$(DESTDIR)$(prefix)"/bin/jackpatch + @ install -d "$(DESTDIR)$(SYSTEM_PATH)"/non-session-manager @ $(MAKE) -s -C doc install @ install -d "$(DESTDIR)$(PIXMAP_PATH)/non-session-manager" @ install -m 644 icons/hicolor/256x256/apps/non-session-manager.png "$(DESTDIR)$(PIXMAP_PATH)"/non-session-manager/icon-256x256.png diff --git a/timeline/doc/Makefile b/timeline/doc/Makefile index a9871d9..d592e33 100644 --- a/timeline/doc/Makefile +++ b/timeline/doc/Makefile @@ -17,8 +17,8 @@ upload: all @ rm -f index.html install: - @ mkdir -p $(DOCUMENT_PATH)/non-daw - @ cp $(OBJS) *.png mup.css ../../COPYING $(DOCUMENT_PATH)/non-daw + @ install -d "$(DESTDIR)$(DOCUMENT_PATH)"/non-daw + @ cp $(OBJS) *.png mup.css ../../COPYING "$(DESTDIR)$(DOCUMENT_PATH)"/non-daw # @ ln -sf $(PIXMAP_PATH)/logo.png $(DOCUMENT_PATH) clean: diff --git a/timeline/makefile.inc b/timeline/makefile.inc index 885a7d0..87b31e2 100644 --- a/timeline/makefile.inc +++ b/timeline/makefile.inc @@ -40,12 +40,11 @@ clean: install: all @ echo -n "Installing..." - @ install src/timeline $(prefix)/bin/non-daw - @ mkdir -p $(SYSTEM_PATH)/non-daw - @ mkdir -p $(PIXMAP_PATH)/non-daw + @ install -Dm755 src/timeline "$(DESTDIR)$(prefix)"/bin/non-daw + @ install -d "$(DESTDIR)$(SYSTEM_PATH)"/non-daw @ $(MAKE) -s -C doc install @ install -d "$(DESTDIR)$(PIXMAP_PATH)/non-daw" - @ install -m 644 icons/hicolor/256x256/apps/non-daw.png "$(DESTDIR)$(PIXMAP_PATH)"/non-daw/icon-256x256.png + @ install -Dm644 icons/hicolor/256x256/apps/non-daw.png "$(DESTDIR)$(PIXMAP_PATH)"/non-daw/icon-256x256.png @ install -d "$(DESTDIR)$(ICON_PATH)/hicolor" @ cp -au icons/hicolor/ "$(DESTDIR)$(ICON_PATH)" @ install -d "$(DESTDIR)$(DESKTOP_PATH)" @@ -53,6 +52,6 @@ install: all @ echo "$(DONE)" ifneq ($(USE_DEBUG),yes) @ echo -n "Stripping..." - @ strip $(prefix)/bin/non-daw + @ strip "$(DESTDIR)$(prefix)"/bin/non-daw @ echo "$(DONE)" endif