diff --git a/Makefile b/Makefile index 3ecc0a6..72ad2ae 100644 --- a/Makefile +++ b/Makefile @@ -164,9 +164,7 @@ install: # Install addtional stuff for Cadence install -m 644 data/pulse2jack/* $(DESTDIR)$(PREFIX)/share/cadence/pulse2jack/ install -m 644 data/pulse2loopback/* $(DESTDIR)$(PREFIX)/share/cadence/pulse2loopback/ - install -m 644 data/21cadence-session-inject $(X11_RC_DIR) - install -m 644 data/70cadence-plugin-paths $(X11_RC_DIR) - install -m 644 data/99cadence-session-start $(X11_RC_DIR) + install -m 644 data/61cadence-session-inject $(X11_RC_DIR) # Install addtional stuff for Claudia cp -r data/icons/* $(DESTDIR)$(PREFIX)/share/cadence/icons/ @@ -190,6 +188,11 @@ install: $(X11_RC_DIR)/70cadence-plugin-paths \ $(X11_RC_DIR)/99cadence-session-start + # Delete old files + rm -f $(X11_RC_DIR)/21cadence-session-inject + rm -f $(X11_RC_DIR)/70cadence-plugin-paths + rm -f $(X11_RC_DIR)/99cadence-session-start + # ----------------------------------------------------------------------------------------------------------------------------------------- uninstall: @@ -213,7 +216,10 @@ uninstall: rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/claudia.svg rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/claudia-launcher.svg rm -f $(DESTDIR)/etc/xdg/autostart/cadence-session-start.desktop + rm -f $(X11_RC_DIR)/61cadence-session-inject + rm -rf $(DESTDIR)$(PREFIX)/share/cadence/ + + # Old stuff rm -f $(X11_RC_DIR)/21cadence-session-inject rm -f $(X11_RC_DIR)/70cadence-plugin-paths rm -f $(X11_RC_DIR)/99cadence-session-start - rm -rf $(DESTDIR)$(PREFIX)/share/cadence/ diff --git a/data/21cadence-session-inject b/data/61cadence-session-inject similarity index 100% rename from data/21cadence-session-inject rename to data/61cadence-session-inject diff --git a/data/70cadence-plugin-paths b/data/70cadence-plugin-paths deleted file mode 100644 index ebc39b0..0000000 --- a/data/70cadence-plugin-paths +++ /dev/null @@ -1,2 +0,0 @@ -# Cadence Session Startup -# Not used anymore diff --git a/data/99cadence-session-start b/data/99cadence-session-start deleted file mode 100644 index ebc39b0..0000000 --- a/data/99cadence-session-start +++ /dev/null @@ -1,2 +0,0 @@ -# Cadence Session Startup -# Not used anymore