Clean up DESTDIR install behavior.

This commit is contained in:
Jonathan Moore Liles 2012-03-30 17:24:22 -07:00
parent 338e66c759
commit f941d7c923
7 changed files with 20 additions and 22 deletions

View File

@ -17,8 +17,8 @@ upload: all
@ rm -f index.html @ rm -f index.html
install: install:
@ mkdir -p $(DOCUMENT_PATH)/non-mixer @ install -d "$(DESTDIR)$(DOCUMENT_PATH)"/non-mixer
@ cp $(OBJS) *.png mup.css ../../COPYING $(DOCUMENT_PATH)/non-mixer @ cp $(OBJS) *.png mup.css ../../COPYING "$(DESTDIR)$(DOCUMENT_PATH)"/non-mixer
# @ ln -sf $(PIXMAP_PATH)/logo.png $(DOCUMENT_PATH) # @ ln -sf $(PIXMAP_PATH)/logo.png $(DOCUMENT_PATH)
clean: clean:

View File

@ -27,11 +27,11 @@ clean:
install: all install: all
@ echo -n "Installing..." @ echo -n "Installing..."
@ install src/mixer "$(DESTDIR)$(prefix)"/bin/non-mixer @ install -Dm755 src/mixer "$(DESTDIR)$(prefix)"/bin/non-mixer
@ mkdir -p "$(DESTDIR)$(SYSTEM_PATH)"/non-mixer @ install -d "$(DESTDIR)$(SYSTEM_PATH)"/non-mixer
@ $(MAKE) -s -C doc install @ $(MAKE) -s -C doc install
@ install -d "$(DESTDIR)$(PIXMAP_PATH)/non-mixer" @ 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" @ install -d "$(DESTDIR)$(ICON_PATH)/hicolor"
@ cp -au icons/hicolor/ "$(DESTDIR)$(ICON_PATH)" @ cp -au icons/hicolor/ "$(DESTDIR)$(ICON_PATH)"
@ install -d "$(DESTDIR)$(DESKTOP_PATH)" @ install -d "$(DESTDIR)$(DESKTOP_PATH)"
@ -39,6 +39,6 @@ install: all
@ echo "$(DONE)" @ echo "$(DONE)"
ifneq ($(USE_DEBUG),yes) ifneq ($(USE_DEBUG),yes)
@ echo -n "Stripping..." @ echo -n "Stripping..."
@ strip $(DESTDIR)$(prefix)/bin/non-mixer @ strip "$(DESTDIR)$(prefix)"/bin/non-mixer
@ echo "$(DONE)" @ echo "$(DONE)"
endif endif

View File

@ -38,8 +38,7 @@ endif
install: all install: all
@ echo -n "Installing..." @ echo -n "Installing..."
@ install -d $(DESTDIR)$(prefix)/bin @ install -Dm755 src/sequencer "$(DESTDIR)$(prefix)"/bin/non-sequencer
@ install -m 755 src/sequencer $(DESTDIR)$(prefix)/bin/non-sequencer
@ install -d "$(DESTDIR)$(SYSTEM_PATH)/instruments" @ install -d "$(DESTDIR)$(SYSTEM_PATH)/instruments"
@ install -m 644 instruments/* "$(DESTDIR)$(SYSTEM_PATH)/instruments" @ install -m 644 instruments/* "$(DESTDIR)$(SYSTEM_PATH)/instruments"
@ $(MAKE) -s -C doc install @ $(MAKE) -s -C doc install
@ -52,7 +51,7 @@ install: all
@ echo "$(DONE)" @ echo "$(DONE)"
ifneq ($(USE_DEBUG),yes) ifneq ($(USE_DEBUG),yes)
@ echo -n "Stripping..." @ echo -n "Stripping..."
@ strip $(DESTDIR)$(prefix)/bin/non-sequencer @ strip "$(DESTDIR)$(prefix)"/bin/non-sequencer
@ echo "$(DONE)" @ echo "$(DONE)"
endif endif

View File

@ -17,8 +17,8 @@ upload: all
@ rm -f index.html @ rm -f index.html
install: install:
@ mkdir -p $(DOCUMENT_PATH)/non-session-manager @ install -d "$(DESTDIR)$(DOCUMENT_PATH)"/non-session-manager
@ cp $(OBJS) *.png mup.css ../../COPYING $(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) # @ ln -sf $(PIXMAP_PATH)/logo.png $(DOCUMENT_PATH)
clean: clean:

View File

@ -39,10 +39,10 @@ clean:
install: all install: all
@ echo -n "Installing..." @ echo -n "Installing..."
@ install src/nsmd "$(DESTDIR)$(prefix)"/bin/nsmd @ install -Dm755 src/nsmd "$(DESTDIR)$(prefix)"/bin/nsmd
@ install src/session-manager "$(DESTDIR)$(prefix)"/bin/non-session-manager @ install -Dm755 src/session-manager "$(DESTDIR)$(prefix)"/bin/non-session-manager
@ install src/jackpatch "$(DESTDIR)$(prefix)"/bin/jackpatch @ install -Dm755 src/jackpatch "$(DESTDIR)$(prefix)"/bin/jackpatch
@ mkdir -p "$(DESTDIR)$(SYSTEM_PATH)"/non-session-manager @ install -d "$(DESTDIR)$(SYSTEM_PATH)"/non-session-manager
@ $(MAKE) -s -C doc install @ $(MAKE) -s -C doc install
@ install -d "$(DESTDIR)$(PIXMAP_PATH)/non-session-manager" @ 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 @ install -m 644 icons/hicolor/256x256/apps/non-session-manager.png "$(DESTDIR)$(PIXMAP_PATH)"/non-session-manager/icon-256x256.png

View File

@ -17,8 +17,8 @@ upload: all
@ rm -f index.html @ rm -f index.html
install: install:
@ mkdir -p $(DOCUMENT_PATH)/non-daw @ install -d "$(DESTDIR)$(DOCUMENT_PATH)"/non-daw
@ cp $(OBJS) *.png mup.css ../../COPYING $(DOCUMENT_PATH)/non-daw @ cp $(OBJS) *.png mup.css ../../COPYING "$(DESTDIR)$(DOCUMENT_PATH)"/non-daw
# @ ln -sf $(PIXMAP_PATH)/logo.png $(DOCUMENT_PATH) # @ ln -sf $(PIXMAP_PATH)/logo.png $(DOCUMENT_PATH)
clean: clean:

View File

@ -40,12 +40,11 @@ clean:
install: all install: all
@ echo -n "Installing..." @ echo -n "Installing..."
@ install src/timeline $(prefix)/bin/non-daw @ install -Dm755 src/timeline "$(DESTDIR)$(prefix)"/bin/non-daw
@ mkdir -p $(SYSTEM_PATH)/non-daw @ install -d "$(DESTDIR)$(SYSTEM_PATH)"/non-daw
@ mkdir -p $(PIXMAP_PATH)/non-daw
@ $(MAKE) -s -C doc install @ $(MAKE) -s -C doc install
@ install -d "$(DESTDIR)$(PIXMAP_PATH)/non-daw" @ 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" @ install -d "$(DESTDIR)$(ICON_PATH)/hicolor"
@ cp -au icons/hicolor/ "$(DESTDIR)$(ICON_PATH)" @ cp -au icons/hicolor/ "$(DESTDIR)$(ICON_PATH)"
@ install -d "$(DESTDIR)$(DESKTOP_PATH)" @ install -d "$(DESTDIR)$(DESKTOP_PATH)"
@ -53,6 +52,6 @@ install: all
@ echo "$(DONE)" @ echo "$(DONE)"
ifneq ($(USE_DEBUG),yes) ifneq ($(USE_DEBUG),yes)
@ echo -n "Stripping..." @ echo -n "Stripping..."
@ strip $(prefix)/bin/non-daw @ strip "$(DESTDIR)$(prefix)"/bin/non-daw
@ echo "$(DONE)" @ echo "$(DONE)"
endif endif