2016-06-18 Fred Gleason <fredg@paravelsystems.com>

* Fixed a bug in 'xdg/Makefile.am' that caused the 'make rpm' target
	to break when HPI support was not enabled.
This commit is contained in:
Fred Gleason 2016-06-18 13:27:24 -04:00
parent c1675087aa
commit b7db9406d9
2 changed files with 5 additions and 2 deletions

View File

@ -15256,3 +15256,6 @@
* Fixed a bug in 'lib/rdsvc.cpp' that caused import events with * Fixed a bug in 'lib/rdsvc.cpp' that caused import events with
minute field values greater than '59' in the Start Time to fail minute field values greater than '59' in the Start Time to fail
to be imported. to be imported.
2016-06-18 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'xdg/Makefile.am' that caused the 'make rpm' target
to break when HPI support was not enabled.

View File

@ -29,7 +29,7 @@ install-exec-am:
cp rivendell-rddgimport.desktop $(DESTDIR)@prefix@/share/applications/ cp rivendell-rddgimport.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rddiscimport.desktop $(DESTDIR)@prefix@/share/applications/ cp rivendell-rddiscimport.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdgpimon.desktop $(DESTDIR)@prefix@/share/applications/ cp rivendell-rdgpimon.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdhpiinfo-root.desktop $(DESTDIR)@prefix@/share/applications/ if test -f ../rdhpi/.libs/librdhpi-@VERSION@.so ; then cp rivendell-rdhpiinfo-root.desktop $(DESTDIR)@prefix@/share/applications/ ; fi
cp rivendell-rdlibrary.desktop $(DESTDIR)@prefix@/share/applications/ cp rivendell-rdlibrary.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdlogedit.desktop $(DESTDIR)@prefix@/share/applications/ cp rivendell-rdlogedit.desktop $(DESTDIR)@prefix@/share/applications/
cp rivendell-rdlogin.desktop $(DESTDIR)@prefix@/share/applications/ cp rivendell-rdlogin.desktop $(DESTDIR)@prefix@/share/applications/
@ -53,7 +53,7 @@ install-exec-am:
rm -f $(DESTDIR)$(prefix)/bin/rdalsaconfig-root rm -f $(DESTDIR)$(prefix)/bin/rdalsaconfig-root
ln -s /usr/bin/consolehelper $(DESTDIR)$(prefix)/bin/rdalsaconfig-root ln -s /usr/bin/consolehelper $(DESTDIR)$(prefix)/bin/rdalsaconfig-root
rm -f $(DESTDIR)$(prefix)/bin/rdhpiinfo-root rm -f $(DESTDIR)$(prefix)/bin/rdhpiinfo-root
ln -s /usr/bin/consolehelper $(DESTDIR)$(prefix)/bin/rdhpiinfo-root if test -f ../rdhpi/.libs/librdhpi-@VERSION@.so ; then ln -s /usr/bin/consolehelper $(DESTDIR)$(prefix)/bin/rdhpiinfo-root ; fi
uninstall-local: uninstall-local:
rm -f $(DESTDIR)@prefix@/share/applications/rivendell-*.desktop rm -f $(DESTDIR)@prefix@/share/applications/rivendell-*.desktop