linuxaudio
/
new-session-manager
mirror of https://github.com/linuxaudio/new-session-manager
1
0
Fork 0
Code Issues 0 Releases 17 Wiki Activity
Browse Source

Clean up DESTDIR install behavior.

tags/non-daw-v1.2.0
Jonathan Moore Liles 13 years ago
parent
338e66c759
commit
f941d7c923
7 changed files with 20 additions and 22 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      mixer/doc/Makefile
  2. +4
    -4
      mixer/makefile.inc
  3. +2
    -3
      sequencer/makefile.inc
  4. +2
    -2
      session-manager/doc/Makefile
  5. +4
    -4
      session-manager/makefile.inc
  6. +2
    -2
      timeline/doc/Makefile
  7. +4
    -5
      timeline/makefile.inc

+ 2
- 2
mixer/doc/Makefile View File

@@ -17,8 +17,8 @@ upload: all
@ rm -f index.html @ rm -f index.html


install: 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) # @ ln -sf $(PIXMAP_PATH)/logo.png $(DOCUMENT_PATH)


clean: clean:


+ 4
- 4
mixer/makefile.inc 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
@ 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 @ $(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

+ 2
- 3
sequencer/makefile.inc View File

@@ -38,8 +38,7 @@ endif


install: all install: all
@ echo -n "Installing..." @ 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 -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



+ 2
- 2
session-manager/doc/Makefile 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
@ 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) # @ ln -sf $(PIXMAP_PATH)/logo.png $(DOCUMENT_PATH)


clean: clean:


+ 4
- 4
session-manager/makefile.inc 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 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 @ $(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


+ 2
- 2
timeline/doc/Makefile View File

@@ -17,8 +17,8 @@ upload: all
@ rm -f index.html @ rm -f index.html


install: 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) # @ ln -sf $(PIXMAP_PATH)/logo.png $(DOCUMENT_PATH)


clean: clean:


+ 4
- 5
timeline/makefile.inc View File

@@ -40,12 +40,11 @@ clean:


install: all install: all
@ echo -n "Installing..." @ 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 @ $(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

Write Preview
Loading…
Cancel
Save