From: Ben Walton Date: Fri, 15 Apr 2011 18:25:36 +0000 (-0400) Subject: Honour DESTDIR in Solaris install-autostart targets X-Git-Tag: Release-7.0.0~951 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=995da238c334b42cc314d97970ff12a2baf7434f;p=bacula%2Fbacula Honour DESTDIR in Solaris install-autostart targets The installation of the init scripts was not taking DESTDIR into account. Correct this so that the init scripts are installed to the same base location as the other files. Signed-off-by: Ben Walton --- diff --git a/bacula/platforms/solaris/Makefile.in b/bacula/platforms/solaris/Makefile.in index 0b391eb659..25f3a97e77 100644 --- a/bacula/platforms/solaris/Makefile.in +++ b/bacula/platforms/solaris/Makefile.in @@ -20,24 +20,24 @@ install: install-autostart install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir install-autostart-%: - @rm -f /etc/rc0.d/K20bacula-$* - @rm -f /etc/rc1.d/S99bacula-$* - @rm -f /etc/rc2.d/S99bacula-$* - @$(INSTALL_PROGRAM) -m 744 bacula-$* /etc/init.d/bacula-$* + @rm -f $(DESTDIR)/etc/rc0.d/K20bacula-$* + @rm -f $(DESTDIR)/etc/rc1.d/S99bacula-$* + @rm -f $(DESTDIR)/etc/rc2.d/S99bacula-$* + @$(INSTALL_PROGRAM) -m 744 bacula-$* $(DESTDIR)/etc/init.d/bacula-$* # set symlinks for script at startup and shutdown - @ln -f -s /etc/init.d/bacula-$* /etc/rc0.d/K20bacula-$* - @ln -f -s /etc/init.d/bacula-$* /etc/rc1.d/S99bacula-$* - @ln -f -s /etc/init.d/bacula-$* /etc/rc2.d/S99bacula-$* + @ln -f -s /etc/init.d/bacula-$* $(DESTDIR)/etc/rc0.d/K20bacula-$* + @ln -f -s /etc/init.d/bacula-$* $(DESTDIR)/etc/rc1.d/S99bacula-$* + @ln -f -s /etc/init.d/bacula-$* $(DESTDIR)/etc/rc2.d/S99bacula-$* uninstall: uninstall-autostart uninstall-autostart: uninstall-autostart-fd uninstall-autostart-sd uninstall-autostart-dir uninstall-autostart-%: - @rm -f /etc/rc0.d/K20bacula-$* - @rm -f /etc/rc1.d/S99bacula-$* - @rm -f /etc/rc2.d/S99bacula-$* - @rm -f /etc/init.d/bacula-$* + @rm -f $(DESTDIR)/etc/rc0.d/K20bacula-$* + @rm -f $(DESTDIR)/etc/rc1.d/S99bacula-$* + @rm -f $(DESTDIR)/etc/rc2.d/S99bacula-$* + @rm -f $(DESTDIR)/etc/init.d/bacula-$* clean: @rm -f 1 2 3