mirror of
				https://github.com/ElvishArtisan/rivendell.git
				synced 2025-10-30 17:23:53 +01:00 
			
		
		
		
	2016-03-25 Fred Gleason <fredg@paravelsystems.com>
* Changed 'uninstall' to 'uninstall-local' targets in all 'Makefile.am' files.
This commit is contained in:
		| @@ -15019,3 +15019,6 @@ | ||||
| 	* Fixed a bug in 'web/rdxport/export.cpp' that caused the web 'Export' | ||||
| 	service to return an internal server error if the requested audio | ||||
| 	didn't exist. | ||||
| 2016-03-25 Fred Gleason <fredg@paravelsystems.com> | ||||
| 	* Changed 'uninstall' to 'uninstall-local' targets in all | ||||
| 	'Makefile.am' files. | ||||
|   | ||||
| @@ -48,7 +48,7 @@ install-exec-am: | ||||
| 	cp rivendell-32x32.xpm $(DESTDIR)@prefix@/share/X11/fvwm2/pixmaps/rivendell.xpm | ||||
|  | ||||
|  | ||||
| uninstall:	 | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)@libexecdir@/greencheckmark.png | ||||
| 	rm -f $(DESTDIR)@libexecdir@/redx.png | ||||
| 	rm -f $(DESTDIR)@libexecdir@/greenball.png | ||||
|   | ||||
| @@ -41,7 +41,7 @@ install-exec-local: | ||||
| 	mkdir -p $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	cp librd_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
|  | ||||
| uninstall: | ||||
| uninstall-local: | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/rivendell/librd_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -36,7 +36,7 @@ install-exec-local: | ||||
| 	mkdir -p $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	cp rdadmin_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
|  | ||||
| uninstall: | ||||
| uninstall-local: | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdadmin_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -35,7 +35,7 @@ install-exec-local: | ||||
| 	mkdir -p $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	cp rdairplay_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
|  | ||||
| uninstall:	 | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/srlabs/rdairplay_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -35,7 +35,7 @@ install-exec-local: | ||||
| 	mkdir -p $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	cp rdcartslots_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
|  | ||||
| uninstall:	 | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdcartslots_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -35,7 +35,7 @@ install-exec-local: | ||||
| 	mkdir -p $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	cp rdcastmanager_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
|  | ||||
| uninstall: | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/srlabs/rdcastmanager_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -35,7 +35,7 @@ install-exec-local: | ||||
| 	mkdir -p $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	cp rdcatch_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
|  | ||||
| uninstall: | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/srlabs/rdcatch_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -44,7 +44,7 @@ install-exec-local: | ||||
| 	mkdir -p $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	cp rdhpi_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
|  | ||||
| uninstall: | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdhpi_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -35,7 +35,7 @@ install-exec-local: | ||||
| 	mkdir -p $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	cp rdlibrary_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
|  | ||||
| uninstall: | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdlibrary_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -35,7 +35,7 @@ install-exec-local: | ||||
| 	mkdir -p $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	cp rdlogedit_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
|  | ||||
| uninstall: | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdlogedit_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -35,7 +35,7 @@ install-exec-local: | ||||
| 	mkdir -p $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	cp rdlogin_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
|  | ||||
| uninstall: | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdlogin_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -35,7 +35,7 @@ install-exec-local: | ||||
| 	mkdir -p $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	cp rdlogmanager_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
|  | ||||
| uninstall: | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdlogmanager_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -35,7 +35,7 @@ install-exec-local: | ||||
| 	mkdir -p $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	cp rdmonitor_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
|  | ||||
| uninstall: | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdmonitor_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -35,7 +35,7 @@ install-exec-local: | ||||
| 	mkdir -p $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	cp rdpanel_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
|  | ||||
| uninstall:	 | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdpanel_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -36,7 +36,7 @@ install-exec-local: | ||||
| 	cp rdselect_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	chmod 4755 $(DESTDIR)$(prefix)/bin/rdselect | ||||
|  | ||||
| uninstall: | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdselect_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -34,7 +34,7 @@ install-exec-local: | ||||
| 	mkdir -p $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	cp rdchunk_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
|  | ||||
| uninstall: | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdchunk_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -34,7 +34,7 @@ install-exec-local: | ||||
| 	mkdir -p $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	cp rddgimport_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
|  | ||||
| uninstall: | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/rivendell/rddgimport_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -34,7 +34,7 @@ install-exec-local: | ||||
| 	mkdir -p $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	cp rddiscimport_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
|  | ||||
| uninstall: | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/rivendell/rddiscimport_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -34,7 +34,7 @@ install-exec-local: | ||||
| 	mkdir -p $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	cp rdgpimon_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
|  | ||||
| uninstall: | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdgpimon_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -34,7 +34,7 @@ install-exec-local: | ||||
| 	mkdir -p $(DESTDIR)$(prefix)/share/rivendell | ||||
| 	cp rmlsend_*.qm $(DESTDIR)$(prefix)/share/rivendell | ||||
|  | ||||
| uninstall: | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)$(prefix)/share/rivendell/rmlsend_*.qm | ||||
|  | ||||
| all:	 | ||||
|   | ||||
| @@ -34,7 +34,7 @@ install-exec-am: | ||||
| 	cp .libs/rdcastmanager.cgi $(DESTDIR)$(libexecdir)/ | ||||
| 	cat rdcastmanager.js | $(top_srcdir)/helpers/jsmin > $(DESTDIR)$(libexecdir)/rdcastmanager.js | ||||
|  | ||||
| uninstall:	 | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)/$(libexecdir)/rdcastmanager.cgi | ||||
| 	rm -f $(DESTDIR)/$(libexecdir)/rdcastmanager.js | ||||
|  | ||||
|   | ||||
| @@ -28,7 +28,7 @@ MOC = @QT_MOC@ | ||||
| install-exec-local:	 | ||||
| 	if test ! -f $(DESTDIR)@libexecdir@/rdfeed.mp3 ; then ln -s @libexecdir@/rdfeed.xml $(DESTDIR)@libexecdir@/rdfeed.mp3 ; fi | ||||
|  | ||||
| uninstall:	 | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)@libexecdir@/rdfeed.mp3 | ||||
|  | ||||
| libexec_PROGRAMS = rdfeed.xml | ||||
|   | ||||
| @@ -57,7 +57,7 @@ install-exec-am: | ||||
| 	rm -f $(DESTDIR)$(prefix)/bin/rdhpiinfo-root | ||||
| 	ln -s /usr/bin/consolehelper $(DESTDIR)$(prefix)/bin/rdhpiinfo-root | ||||
|  | ||||
| uninstall:	 | ||||
| uninstall-local:	 | ||||
| 	rm -f $(DESTDIR)@prefix@/share/applications/rivendell-*.desktop | ||||
| 	rm -f $(DESTDIR)@prefix@/share/desktop-directories/rivendell-*.directory | ||||
| 	rm -f $(DESTDIR)/etc/xdg/menus/applications-merged/rivendell-*.menu | ||||
|   | ||||
		Reference in New Issue
	
	Block a user