diff -uNr ssd.orig/Makefile.am ssd/Makefile.am --- ssd.orig/Makefile.am Wed May 26 19:12:52 1999 +++ ssd/Makefile.am Wed Mar 8 18:36:46 2000 @@ -33,16 +33,17 @@ uninstall-local: uninstall-initscript uninstall-ssd-conf initdir = $(DESTDIR)/etc/rc.d/init.d +realinitdir = /etc/rc.d/init.d install-initscript: $(initscript) $(INSTALL_PROGRAM) $(initscript) $(initdir)/$(initscript) - ln -sf $(initdir)/$(initscript) $(initdir)/../rc0.d/K99$(initscript) - ln -sf $(initdir)/$(initscript) $(initdir)/../rc1.d/S99$(initscript) - ln -sf $(initdir)/$(initscript) $(initdir)/../rc1.d/K99$(initscript) - ln -sf $(initdir)/$(initscript) $(initdir)/../rc2.d/S99$(initscript) - ln -sf $(initdir)/$(initscript) $(initdir)/../rc3.d/S99$(initscript) - ln -sf $(initdir)/$(initscript) $(initdir)/../rc5.d/S99$(initscript) - ln -sf $(initdir)/$(initscript) $(initdir)/../rc6.d/K99$(initscript) + ln -sf $(realinitdir)/$(initscript) $(initdir)/../rc0.d/K99$(initscript) + ln -sf $(realinitdir)/$(initscript) $(initdir)/../rc1.d/S99$(initscript) + ln -sf $(realinitdir)/$(initscript) $(initdir)/../rc1.d/K99$(initscript) + ln -sf $(realinitdir)/$(initscript) $(initdir)/../rc2.d/S99$(initscript) + ln -sf $(realinitdir)/$(initscript) $(initdir)/../rc3.d/S99$(initscript) + ln -sf $(realinitdir)/$(initscript) $(initdir)/../rc5.d/S99$(initscript) + ln -sf $(realinitdir)/$(initscript) $(initdir)/../rc6.d/K99$(initscript) -test -x /sbin/chkconfig || chkconfig --add $(initscript) uninstall-initscript: @@ -58,7 +59,7 @@ install-ssd-conf: $(ssd_conf) - $(INSTALL_DATA) $(srcdir)/$(ssd_conf) /etc/$(ssd_conf) + $(INSTALL_DATA) $(srcdir)/$(ssd_conf) $(DESTDIR)/etc/$(ssd_conf) uninstall-ssd-conf: - -rm -f /etc/$(ssd_conf) + -rm -f $(DESTDIR)/etc/$(ssd_conf) diff -uNr ssd.orig/Makefile.in ssd/Makefile.in --- ssd.orig/Makefile.in Tue Jul 6 15:01:10 1999 +++ ssd/Makefile.in Wed Mar 8 19:10:50 2000 @@ -66,7 +66,7 @@ DISTCLEANFILES = \\\#*\\\# MOSTLYCLEANFILES = *~ *.o *.bak -realsbindir = $(DESTDIR)/sbin +realsbindir = /sbin realsbin_PROGRAMS = ssd pkgdata_SCRIPTS = ssdwall.sh ssdshut.sh @@ -87,6 +87,7 @@ INCLUDES=-DSSD_DIR=\"$(pkgdatadir)\" initdir = $(DESTDIR)/etc/rc.d/init.d +realinitdir = /etc/rc.d/init.d ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h @@ -174,15 +175,15 @@ $(mkinstalldirs) $(DESTDIR)$(realsbindir) @list='$(realsbin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(realsbindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(realsbindir)/`echo $$p|sed '$(transform)'`; \ + echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(realsbindir)/apc-`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_PROGRAM) $$p $(DESTDIR)$(realsbindir)/apc-`echo $$p|sed '$(transform)'`; \ else :; fi; \ done uninstall-realsbinPROGRAMS: @$(NORMAL_UNINSTALL) list='$(realsbin_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(realsbindir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(realsbindir)/apc`echo $$p|sed '$(transform)'`; \ done .c.o: @@ -376,13 +377,13 @@ install-initscript: $(initscript) $(INSTALL_PROGRAM) $(initscript) $(initdir)/$(initscript) - ln -sf $(initdir)/$(initscript) $(initdir)/../rc0.d/K99$(initscript) - ln -sf $(initdir)/$(initscript) $(initdir)/../rc1.d/S99$(initscript) - ln -sf $(initdir)/$(initscript) $(initdir)/../rc1.d/K99$(initscript) - ln -sf $(initdir)/$(initscript) $(initdir)/../rc2.d/S99$(initscript) - ln -sf $(initdir)/$(initscript) $(initdir)/../rc3.d/S99$(initscript) - ln -sf $(initdir)/$(initscript) $(initdir)/../rc5.d/S99$(initscript) - ln -sf $(initdir)/$(initscript) $(initdir)/../rc6.d/K99$(initscript) + ln -sf $(realinitdir)/$(initscript) $(initdir)/../rc0.d/K99$(initscript) + ln -sf $(realinitdir)/$(initscript) $(initdir)/../rc1.d/S99$(initscript) + ln -sf $(realinitdir)/$(initscript) $(initdir)/../rc1.d/K99$(initscript) + ln -sf $(realinitdir)/$(initscript) $(initdir)/../rc2.d/S99$(initscript) + ln -sf $(realinitdir)/$(initscript) $(initdir)/../rc3.d/S99$(initscript) + ln -sf $(realinitdir)/$(initscript) $(initdir)/../rc5.d/S99$(initscript) + ln -sf $(realinitdir)/$(initscript) $(initdir)/../rc6.d/K99$(initscript) -test -x /sbin/chkconfig || chkconfig --add $(initscript) uninstall-initscript: @@ -397,10 +398,10 @@ -test -x /sbin/chkconfig || chkconfig --del $(initscript) install-ssd-conf: $(ssd_conf) - $(INSTALL_DATA) $(srcdir)/$(ssd_conf) /etc/$(ssd_conf) + $(INSTALL_DATA) $(srcdir)/$(ssd_conf) $(DESTDIR)/etc/$(ssd_conf) uninstall-ssd-conf: - -rm -f /etc/$(ssd_conf) + -rm -f $(DESTDIR)/etc/$(ssd_conf) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -uNr ssd.orig/apcssd ssd/apcssd --- ssd.orig/apcssd Tue May 18 18:49:09 1999 +++ ssd/apcssd Wed Mar 8 19:11:41 2000 @@ -32,19 +32,19 @@ start) # Start daemons. echo -n "Starting APC Simple Signalling Daemon: " - daemon ssd /etc/ssd.conf + apc-ssd /etc/ssd.conf echo touch /var/lock/subsys/ssd ;; stop) # Stop daemons. echo -n "Shutting down APC Simple Signalling Daemon: " - killproc ssd + killproc apc-ssd echo rm -f /var/lock/subsys/ssd ;; status) - status ssd + status apc-ssd ;; restart|reload) $0 stop