Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-28 14:42:34 +02:00
Code Issues Projects Releases Wiki Activity

2014-08-14 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in 'Makefile.am' that broke the 'make install' rule
	when using DESTDIR.
	* Fixed a bug in 'icons/Makefile.am' that broke the 'make install'
	rule when using DESTDIR.
	* Fixed a bug in 'rlm/Makefile.am' that broke the 'make install'
	rule when using DESTDIR.
	* Fixed a bug in 'scripts/Makefile.am' that broke the 'make install'
	rule when using DESTDIR.
	* Fixed a bug in 'xdg/Makefile.am' that broke the 'make install'
	rule when using DESTDIR.
	* Fixed a bug in 'rdselect/Makefile.am' that broke the 'make install'
	rule when using DESTDIR.
	* Fixed a bug in 'web/rdxport/Makefile.am' that broke the
	'make install' rule when using DESTDIR.
	* Fixed a bug in 'configure.ac' that cause an incorrect VERSION
	string to be generated.
This commit is contained in:
Fred Gleason 2014-08-14 20:13:50 -04:00
parent 89b846f7d6
commit e0e5d76d6c
10 changed files with 88 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -14354,3 +14354,20 @@
* Fixed warnings in 'utils/rdimport/rdimport.cpp'
* Fixed warnings in 'utils/rdsoftkeys/rdsoftkeys.cpp'
* Fixed warnings in 'web/rdxport/export.cpp'
2014-08-14 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'Makefile.am' that broke the 'make install' rule
when using DESTDIR.
* Fixed a bug in 'icons/Makefile.am' that broke the 'make install'
rule when using DESTDIR.
* Fixed a bug in 'rlm/Makefile.am' that broke the 'make install'
rule when using DESTDIR.
* Fixed a bug in 'scripts/Makefile.am' that broke the 'make install'
rule when using DESTDIR.
* Fixed a bug in 'xdg/Makefile.am' that broke the 'make install'
rule when using DESTDIR.
* Fixed a bug in 'rdselect/Makefile.am' that broke the 'make install'
rule when using DESTDIR.
* Fixed a bug in 'web/rdxport/Makefile.am' that broke the
'make install' rule when using DESTDIR.
* Fixed a bug in 'configure.ac' that cause an incorrect VERSION
string to be generated.

8
Makefile.am
View File

@ -68,7 +68,7 @@ maintainer-clean-local:
rm -rf m4
install-exec-local:
./install-init.sh $(DESTDIR)$(prefix)
./install-init.sh $(DESTDIR)$(prefix) $(DESTDIR)
install-debian:
touch ./building-debian
@ -76,9 +76,9 @@ install-debian:
rm -f ./building-debian
uninstall-exec:
rm -f /etc/init.d/rdrepld
rm -f /etc/init.d/rivendell
rm -f /etc/sysconfig/rivendell
rm -f $(DESTDIR)/etc/init.d/rdrepld
rm -f $(DESTDIR)/etc/init.d/rivendell
rm -f $(DESTDIR)/etc/sysconfig/rivendell
rpm: dist
cp rivendell-$(VERSION).tar.gz $(RPM_ROOT)/SOURCES/

2
configure.ac
View File

@ -19,7 +19,7 @@ dnl License along with this program; if not, write to the Free Software
dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
dnl
AC_INIT([rivendell],m4_esyscmd_s(echo PACKAGE_VERSION))
AC_INIT([rivendell],m4_esyscmd_s(cat PACKAGE_VERSION))
AM_INIT_AUTOMAKE
AC_SUBST(RPM_RELEASE,1)
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])

36
icons/Makefile.am
View File

@ -31,18 +31,18 @@ install-exec-am:
cp redball.png $(DESTDIR)@libexecdir@
cp whiteball.png $(DESTDIR)@libexecdir@
cp progressbar.gif $(DESTDIR)@libexecdir@
mkdir -p @prefix@/share/icons/hicolor/16x16/apps
cp rivendell-16x16.png @prefix@/share/icons/hicolor/16x16/apps/rivendell.png
mkdir -p @prefix@/share/icons/hicolor/22x22/apps
cp rivendell-22x22.png @prefix@/share/icons/hicolor/22x22/apps/rivendell.png
mkdir -p @prefix@/share/icons/hicolor/32x32/apps
cp rivendell-32x32.png @prefix@/share/icons/hicolor/32x32/apps/rivendell.png
mkdir -p @prefix@/share/icons/hicolor/48x48/apps
cp rivendell-48x48.png @prefix@/share/icons/hicolor/48x48/apps/rivendell.png
mkdir -p @prefix@/share/icons/hicolor/64x64/apps
cp rivendell-64x64.png @prefix@/share/icons/hicolor/64x64/apps/rivendell.png
mkdir -p @prefix@/share/icons/hicolor/128x128/apps
cp rivendell-128x128.png @prefix@/share/icons/hicolor/128x128/apps/rivendell.png
mkdir -p $(DESTDIR)@prefix@/share/icons/hicolor/16x16/apps
cp rivendell-16x16.png $(DESTDIR)@prefix@/share/icons/hicolor/16x16/apps/rivendell.png
mkdir -p $(DESTDIR)@prefix@/share/icons/hicolor/22x22/apps
cp rivendell-22x22.png $(DESTDIR)@prefix@/share/icons/hicolor/22x22/apps/rivendell.png
mkdir -p $(DESTDIR)@prefix@/share/icons/hicolor/32x32/apps
cp rivendell-32x32.png $(DESTDIR)@prefix@/share/icons/hicolor/32x32/apps/rivendell.png
mkdir -p $(DESTDIR)@prefix@/share/icons/hicolor/48x48/apps
cp rivendell-48x48.png $(DESTDIR)@prefix@/share/icons/hicolor/48x48/apps/rivendell.png
mkdir -p $(DESTDIR)@prefix@/share/icons/hicolor/64x64/apps
cp rivendell-64x64.png $(DESTDIR)@prefix@/share/icons/hicolor/64x64/apps/rivendell.png
mkdir -p $(DESTDIR)@prefix@/share/icons/hicolor/128x128/apps
cp rivendell-128x128.png $(DESTDIR)@prefix@/share/icons/hicolor/128x128/apps/rivendell.png
uninstall:
rm -f $(DESTDIR)@libexecdir@/greencheckmark.png
@ -51,12 +51,12 @@ uninstall:
rm -f $(DESTDIR)@libexecdir@/redball.png
rm -f $(DESTDIR)@libexecdir@/whiteball.png
rm -f $(DESTDIR)@libexecdir@/progressbar.gif
rm -f @prefix@/share/icons/hicolor/16x16/apps/rivendell.png
rm -f @prefix@/share/icons/hicolor/22x22/apps/rivendell.png
rm -f @prefix@/share/icons/hicolor/32x32/apps/rivendell.png
rm -f @prefix@/share/icons/hicolor/48x48/apps/rivendell.png
rm -f @prefix@/share/icons/hicolor/64x64/apps/rivendell.png
rm -f @prefix@/share/icons/hicolor/128x128/apps/rivendell-128x128.png
rm -f $(DESTDIR)@prefix@/share/icons/hicolor/16x16/apps/rivendell.png
rm -f $(DESTDIR)@prefix@/share/icons/hicolor/22x22/apps/rivendell.png
rm -f $(DESTDIR)@prefix@/share/icons/hicolor/32x32/apps/rivendell.png
rm -f $(DESTDIR)@prefix@/share/icons/hicolor/48x48/apps/rivendell.png
rm -f $(DESTDIR)@prefix@/share/icons/hicolor/64x64/apps/rivendell.png
rm -f $(DESTDIR)@prefix@/share/icons/hicolor/128x128/apps/rivendell-128x128.png
EXTRA_DIST = admin.xpm\
blueball.xpm\

27
install-init.sh
View File

@ -23,19 +23,22 @@
#
if test ! -f ./building-debian ; then
mkdir -p /etc/init.d
cp rivendell /etc/init.d/rivendell
cp rdrepld-suse /etc/init.d/rdrepld
mkdir -p /etc/sysconfig
cp rivendell.sys /etc/sysconfig/rivendell
mkdir -p /var/run/rivendell
chmod 777 /var/run/rivendell
ldconfig
mkdir -p $2/etc/init.d
cp rivendell $2/etc/init.d/rivendell
cp rdrepld-suse $2/etc/init.d/rdrepld
mkdir -p $2/etc/sysconfig
cp rivendell.sys $2/etc/sysconfig/rivendell
mkdir -p $2/var/run/rivendell
if test -z $2 ; then
chmod 777 /var/run/rivendell
ldconfig
fi
fi
chmod 4755 $1/bin/caed
chmod 4755 $1/bin/ripcd
chmod 4755 $1/bin/rdcatchd
if test -z $2 ; then
chmod 4755 $1/bin/caed
chmod 4755 $1/bin/ripcd
chmod 4755 $1/bin/rdcatchd
fi
# End of install-init.sh

2
rdselect/Makefile.am
View File

@ -34,7 +34,7 @@ moc_%.cpp: %.h
install-exec-local:
mkdir -p $(DESTDIR)$(prefix)/share/rivendell
cp rdselect_*.qm $(DESTDIR)$(prefix)/share/rivendell
chmod 4755 $(prefix)/bin/rdselect
chmod 4755 $(DESTDIR)$(prefix)/bin/rdselect
uninstall:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdselect_*.qm

4
rlm/Makefile.am
View File

@ -48,8 +48,8 @@ all: $(RLM_MODULES)
install: all
mkdir -p $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell
cp $(RLM_MODULES) $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/
mkdir -p $(headerdir)
cp rlm.h $(headerdir)
mkdir -p $(DESTDIR)$(headerdir)
cp rlm.h $(DESTDIR)$(headerdir)
headerdir = $(includedir)/rlm
header_HEADERS = rlm.h

6
scripts/Makefile.am
View File

@ -23,11 +23,11 @@
## Use automake to process this into a Makefile.in
install-exec-local:
mkdir -p /etc/X11/xinit/xinitrc.d
cp start-rdmonitor.sh /etc/X11/xinit/xinitrc.d/
mkdir -p $(DESTDIR)/etc/X11/xinit/xinitrc.d
cp start-rdmonitor.sh $(DESTDIR)/etc/X11/xinit/xinitrc.d/
uninstall-local:
rm -f /etc/X11/xinit/xinitrc.d/start-rdmonitor.sh
rm -f $(DESTDIR)/etc/X11/xinit/xinitrc.d/start-rdmonitor.sh
bin_SCRIPTS = crc-unity4k.sh\
rd_audio_sync\

3
web/rdxport/Makefile.am
View File

@ -28,8 +28,7 @@ MOC = @QT_MOC@
libexec_PROGRAMS = rdxport.cgi
install-exec-hook:
chown root $(libexecdir)/rdxport.cgi
chmod 4755 $(libexecdir)/rdxport.cgi
if test -z $(DESTDIR) ; then chown root $(DESTDIR)$(libexecdir)/rdxport.cgi ; chmod 4755 $(DESTDIR)$(libexecdir)/rdxport.cgi ; fi
dist_rdxport_cgi_SOURCES = audioinfo.cpp\
carts.cpp\

52
xdg/Makefile.am
View File

@ -22,34 +22,34 @@
## Use automake to process this into a Makefile.in
install-exec-am:
mkdir -p @prefix@/share/applications
cp rivendell-rdadmin.desktop @prefix@/share/applications/
cp rivendell-rdairplay.desktop @prefix@/share/applications/
cp rivendell-rdalsaconfig.desktop @prefix@/share/applications/
cp rivendell-rdcartslots.desktop @prefix@/share/applications/
cp rivendell-rdcastmanager.desktop @prefix@/share/applications/
cp rivendell-rdcatch.desktop @prefix@/share/applications/
cp rivendell-rddgimport.desktop @prefix@/share/applications/
cp rivendell-rddiscimport.desktop @prefix@/share/applications/
cp rivendell-rdgpimon.desktop @prefix@/share/applications/
cp rivendell-rdhpiinfo.desktop @prefix@/share/applications/
cp rivendell-rdlibrary.desktop @prefix@/share/applications/
cp rivendell-rdlogedit.desktop @prefix@/share/applications/
cp rivendell-rdlogin.desktop @prefix@/share/applications/
cp rivendell-rdlogmanager.desktop @prefix@/share/applications/
cp rivendell-rdmonitor.desktop @prefix@/share/applications/
cp rivendell-rdpanel.desktop @prefix@/share/applications/
cp rivendell-rdsoftkeys.desktop @prefix@/share/applications/
cp rivendell-rmlsend.desktop @prefix@/share/applications/
mkdir -p @prefix@/share/desktop-directories
cp *.directory @prefix@/share/desktop-directories/
mkdir -p /etc/xdg/menus/applications-merged
cp *.menu /etc/xdg/menus/applications-merged/
mkdir -p $(DESTDIR)@prefix@/share/applications
cp rivendell-rdadmin.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdairplay.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdalsaconfig.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdcartslots.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdcastmanager.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdcatch.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rddgimport.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rddiscimport.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdgpimon.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdhpiinfo.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdlibrary.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdlogedit.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdlogin.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdlogmanager.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdmonitor.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdpanel.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdsoftkeys.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rmlsend.desktop $(DESTDIR)@prefix@/share/applications/
mkdir -p $(DESTDIR)@prefix@/share/desktop-directories
cp *.directory $(DESTDIR)@prefix@/share/desktop-directories/
mkdir -p $(DESTDIR)/etc/xdg/menus/applications-merged
cp *.menu $(DESTDIR)/etc/xdg/menus/applications-merged/
uninstall:
rm -f @prefix@/share/applications/rivendell-*.desktop
rm -f @prefix@/share/desktop-directories/rivendell-*.directory
rm -f /etc/xdg/menus/applications-merged/rivendell-*.menu
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
EXTRA_DIST = rdalsaconfig-root-consolehelper\
rdalsaconfig-root-pam\