diff -auNr apcupsd-3.9.9-clean/Makefile.in apcupsd-3.9.9/Makefile.in --- apcupsd-3.9.9-clean/Makefile.in Sun May 5 07:17:17 2002 +++ apcupsd-3.9.9/Makefile.in Wed Sep 11 02:48:47 2002 @@ -24,31 +24,31 @@ install: install-directories install-subdirs install-directories: install-dir@CGI@ - @if [ ! -d /tmp ] ; then \ - $(SHELL) $(MKINSTALLDIRS) /tmp \ - chmod 777 /tmp; \ + @if [ ! -d $(DESTDIR)/tmp ] ; then \ + $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)/tmp \ + chmod 777 $(DESTDIR)/tmp; \ fi - @if [ ! -d $(prefix) ] ; then \ - $(SHELL) $(MKINSTALLDIRS) $(prefix) \ - chmod 755 $(prefix); \ + @if [ ! -d $(DESTDIR)$(prefix) ] ; then \ + $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(prefix) \ + chmod 755 $(DESTDIR)$(prefix); \ fi - @if [ ! -d $(prefix) ] ; then \ - $(SHELL) $(MKINSTALLDIRS) $(prefix) \ - chmod 755 $(prefix); \ + @if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then \ + $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(exec_prefix) \ + chmod 755 $(DESTDIR)$(exec_prefix); \ fi - @if [ ! -d $(sbindir) ] ; then \ - $(SHELL) $(MKINSTALLDIRS) $(sbindir) \ - chmod 755 $(sbindir); \ + @if [ ! -d $(DESTDIR)$(sbindir) ] ; then \ + $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \ + chmod 755 $(DESTDIR)$(sbindir); \ fi - @if [ ! -d $(sysconfdir) ] ; then \ - $(SHELL) $(MKINSTALLDIRS) $(sysconfdir) \ - chmod 755 $(sysconfdir); \ + @if [ ! -d $(DESTDIR)$(sysconfdir) ] ; then \ + $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) \ + chmod 755 $(DESTDIR)$(sysconfdir); \ fi install-dir: dummy install-dircgi: - @$(SHELL) $(MKINSTALLDIRS) $(cgibin) + @$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(cgibin) uninstall: uninstall-subdirs diff -auNr apcupsd-3.9.9-clean/autoconf/configure.in apcupsd-3.9.9/autoconf/configure.in --- apcupsd-3.9.9-clean/autoconf/configure.in Mon May 13 11:42:09 2002 +++ apcupsd-3.9.9/autoconf/configure.in Wed Sep 11 02:48:47 2002 @@ -1043,6 +1043,9 @@ elif test -f /etc/slackware-version then DISTNAME=slackware +elif test -f /etc/gentoo-version +then + DISTNAME=gentoo elif test -f /etc/engarde-version then DISTNAME=engarde @@ -1192,6 +1195,15 @@ platforms/freebsd/apccontrol.sh \ " ;; +gentoo) + DISTVER=`uname -r` + DFILES="\ + platforms/apccontrol \ + platforms/gentoo/Makefile \ + platforms/gentoo/apcupsd \ + platforms/gentoo/halt \ + " + ;; hpux) DISTVER=`uname -r` DFILES="\ diff -auNr apcupsd-3.9.9-clean/doc/Makefile.in apcupsd-3.9.9/doc/Makefile.in --- apcupsd-3.9.9-clean/doc/Makefile.in Fri Apr 19 12:48:51 2002 +++ apcupsd-3.9.9/doc/Makefile.in Wed Sep 11 02:48:47 2002 @@ -20,12 +20,12 @@ install-man: apcupsd.man @$(ECHO) "Installing manual pages..." - @$(SHELL) $(MKINSTALLDIRS) $(mandir) - @$(INSTALL_DATA) apcupsd.man $(mandir)/apcupsd.$(manext) + @$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(mandir) + @$(INSTALL_DATA) apcupsd.man $(DESTDIR)$(mandir)/apcupsd.$(manext) uninstall: @$(ECHO) "Removing manual page ..." - @$(RM) -f $(mandir)/apcupsd.$(manext) + @$(RM) -f $(DESTDIR)$(mandir)/apcupsd.$(manext) clean: targetclean diff -auNr apcupsd-3.9.9-clean/examples/Makefile.in apcupsd-3.9.9/examples/Makefile.in --- apcupsd-3.9.9-clean/examples/Makefile.in Sat May 18 03:47:25 2002 +++ apcupsd-3.9.9/examples/Makefile.in Wed Sep 11 02:48:47 2002 @@ -38,7 +38,7 @@ install: @echo "Installing examples ..." - @$(CP) -rp $(topdir)/examples $(sysconfdir) + @$(CP) -rp $(DESTDIR)$(topdir)/examples $(sysconfdir) uninstall: diff -auNr apcupsd-3.9.9-clean/platforms/Makefile.in apcupsd-3.9.9/platforms/Makefile.in --- apcupsd-3.9.9-clean/platforms/Makefile.in Sun May 5 06:22:01 2002 +++ apcupsd-3.9.9/platforms/Makefile.in Wed Sep 11 02:48:47 2002 @@ -21,16 +21,19 @@ # install-distdir: (cd $(DISTNAME); \ - $(MAKE) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" install); + $(MAKE) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" install); \ ./install-symlinks.sh install $(DISTNAME) install: @INSTALL_DISTDIR@ @echo "Installing apccontrol script..." @if test -f ./$(DISTNAME)/apccontrol; then \ - $(INSTALL_PROGRAM) -m 744 ./$(DISTNAME)/apccontrol $(sysconfdir)/apccontrol; \ + $(INSTALL_PROGRAM) -m 744 ./$(DISTNAME)/apccontrol \ + $(DESTDIR)$(sysconfdir)/apccontrol; \ else \ - $(INSTALL_PROGRAM) -m 744 ./apccontrol $(sysconfdir)/apccontrol; \ + $(INSTALL_PROGRAM) -m 744 ./apccontrol \ + $(DESTDIR)$(sysconfdir)/apccontrol; \ fi + (cd etc; $(MAKE) install) # # uninstall symlinks before removing the boot script etc etc @@ -41,7 +44,7 @@ $(MAKE) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" uninstall); uninstall: @UNINSTALL_DISTDIR@ - rm -f $(sysconfdir)/apccontrol + rm -f $(DESTDIR)$(sysconfdir)/apccontrol clean: targetclean diff -auNr apcupsd-3.9.9-clean/platforms/etc/Makefile.in apcupsd-3.9.9/platforms/etc/Makefile.in --- apcupsd-3.9.9-clean/platforms/etc/Makefile.in Sun May 5 06:37:40 2002 +++ apcupsd-3.9.9/platforms/etc/Makefile.in Wed Sep 11 02:48:47 2002 @@ -19,15 +19,20 @@ install: @echo "Installing apcupsd.conf..."; \ - srcconf=$(topdir)/etc/apcupsd.conf; \ - if test -f $(sysconfdir)/apcupsd.conf; then \ + srcconf=apcupsd.conf; \ + if test -f $(DESTDIR)$(sysconfdir)/apcupsd.conf; then \ dstconf=apcupsd.conf.new; \ - echo " Found old apcupsd.conf, installing new conf file as $$dstconf"; \ + echo " Found old apcupsd.conf, installing new file as $$dstconf"; \ else \ dstconf=apcupsd.conf; \ fi; \ - echo "$(INSTALL_DATA) $$srcconf $(sysconfdir)/$$dstconf"; \ - $(INSTALL_DATA) $$srcconf $(sysconfdir)/$$dstconf + echo "$(INSTALL_DATA) $$srcconf $(DESTDIR)$(sysconfdir)/$$dstconf"; \ + $(INSTALL_DATA) $$srcconf $(DESTDIR)$(sysconfdir)/$$dstconf; \ + for src in changeme commfailure commok masterconnect \ + mastertimeout mainsback onbattery; do \ + echo "$(INSTALL_PROGRAM) $$src $(DESTDIR)$(sysconfdir)/$$src"; \ + $(INSTALL_PROGRAM) $$src $(DESTDIR)$(sysconfdir)/$$src; \ + done uninstall: diff -auNr apcupsd-3.9.9-clean/platforms/gentoo/Makefile.in apcupsd-3.9.9/platforms/gentoo/Makefile.in --- apcupsd-3.9.9-clean/platforms/gentoo/Makefile.in Wed Dec 31 16:00:00 1969 +++ apcupsd-3.9.9/platforms/gentoo/Makefile.in Wed Sep 11 02:48:47 2002 @@ -0,0 +1,31 @@ +# Makefile template +# +# Copyright (C) 1999-2002 Riccardo Facchetti +# + +# Default variables +@VARIABLES@ +# TOP source directory. +topdir = @top_srcdir@ +top_builddir = $(topdir) + +# Include the default make targets: to be put before the all-targets: rule. +@TARGETS@ + +all-targets: Makefile + +install: + @echo "Installing apcupsd boot scripts..." + $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)/etc/init.d; \ + $(INSTALL_PROGRAM) apcupsd $(DESTDIR)/etc/init.d/apcupsd + $(INSTALL_PROGRAM) halt $(DESTDIR)/etc/init.d/halt + +uninstall: + @echo "Removing boot scripts..." + @$(RMF) $(DESTDIR)/etc/init.d/apcupsd +# @$(RMF) $(DESTDIR)/etc/init.d/halt + +clean: + +distclean: + @$(RMF) apcupsd Makefile diff -auNr apcupsd-3.9.9-clean/platforms/gentoo/apcupsd.in apcupsd-3.9.9/platforms/gentoo/apcupsd.in --- apcupsd-3.9.9-clean/platforms/gentoo/apcupsd.in Wed Dec 31 16:00:00 1969 +++ apcupsd-3.9.9/platforms/gentoo/apcupsd.in Wed Sep 11 02:48:47 2002 @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /home/cvsroot/gentoo-x86/sys-apps/apcupsd/files/apcupsd,v 1.4 2001/12/23 23:25:19 azarah Exp $ + +APCPID=@PIDDIR@/apcupsd.pid +APCUPSD=@sbindir@/apcupsd + +start() { + rm -f /etc/apcupsd/powerfail + ebegin "Starting APC UPS daemon" + start-stop-daemon --start --quiet --exec $APCUPSD -- 1>&2 + eend $? +} + +stop() { + ebegin "Stopping APC UPS daemon" + start-stop-daemon --stop --quiet --pidfile $APCPID + eend $? +} diff -auNr apcupsd-3.9.9-clean/platforms/gentoo/halt.in apcupsd-3.9.9/platforms/gentoo/halt.in --- apcupsd-3.9.9-clean/platforms/gentoo/halt.in Wed Dec 31 16:00:00 1969 +++ apcupsd-3.9.9/platforms/gentoo/halt.in Wed Sep 11 02:48:47 2002 @@ -0,0 +1,24 @@ +#!/bin/sh +# +# halt Execute the halt command. +# +# Version: @(#)halt 2.75 19-May-1998 miquels@cistron.nl +# modified by Holger Brueckner +# for apcupsd 28-June-2001 + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +APCCONTROL="/etc/apcupsd/apccontrol killpower" + +# See if we need to cut the power. + +# See if this is a powerfail situation. +if [ -f /etc/apcupsd/powerfail ]; then + echo "APCUPSD to the Rescue!" + echo + $APCCONTROL + echo + sleep 120 + exit 1 +fi + +/sbin/halt -nfip diff -auNr apcupsd-3.9.9-clean/src/Makefile.in apcupsd-3.9.9/src/Makefile.in --- apcupsd-3.9.9-clean/src/Makefile.in Wed May 8 13:06:29 2002 +++ apcupsd-3.9.9/src/Makefile.in Wed Sep 11 02:48:47 2002 @@ -61,8 +61,9 @@ install-binary: $(allexe) @$(ECHO) "Installing daemons ..." - @$(SHELL) $(MKINSTALLDIRS) $(sbindir) - @$(INSTALL_PROGRAM) -s -m 700 apcupsd@EXEEXT@ $(sbindir)/apcupsd@EXEEXT@ + @$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) + @$(INSTALL_PROGRAM) -s -m 700 apcupsd@EXEEXT@ \ + $(DESTDIR)$(sbindir)/apcupsd@EXEEXT@ @$(MAKE) install-@APCNISD@ @$(MAKE) install-@APCACCESS@ @$(MAKE) install-@SMTP@ @@ -70,25 +71,27 @@ install-apcaccess: @$(INSTALL_PROGRAM) -s -m 755 apcaccess@EXEEXT@ \ - $(sbindir)/apcaccess@EXEEXT@ + $(DESTDIR)$(sbindir)/apcaccess@EXEEXT@ install-smtp: - @$(INSTALL_PROGRAM) -s -m 755 smtp@EXEEXT@ $(sbindir)/smtp@EXEEXT@ + @$(INSTALL_PROGRAM) -s -m 755 smtp@EXEEXT@ \ + $(DESTDIR)$(sbindir)/smtp@EXEEXT@ install-apcnisd: - @$(INSTALL_PROGRAM) -s -m 700 apcnisd@EXEEXT@ $(sbindir)/apcnisd@EXEEXT@ + @$(INSTALL_PROGRAM) -s -m 700 apcnisd@EXEEXT@ \ + $(DESTDIR)$(sbindir)/apcnisd@EXEEXT@ install-powerflute: @$(INSTALL_PROGRAM) -s -m 755 powerflute@EXEEXT@ \ - $(sbindir)/powerflute@EXEEXT@ + $(DESTDIR)$(sbindir)/powerflute@EXEEXT@ uninstall: @$(ECHO) "Removing daemons ..." - @$(RM) -f $(sbindir)/apcupsd@EXEEXT@ - @$(RM) -f $(sbindir)/apcnisd@EXEEXT@ - @$(RM) -f $(sbindir)/apcaccess@EXEEXT@ - @$(RM) -f $(sbindir)/apctest@EXEEXT@ - @$(RM) -f $(sbindir)/powerflute@EXEEXT@ + @$(RMF) $(DESTDIR)$(sbindir)/apcupsd@EXEEXT@ + @$(RMF) $(DESTDIR)$(sbindir)/apcnisd@EXEEXT@ + @$(RMF) $(DESTDIR)$(sbindir)/apcaccess@EXEEXT@ + @$(RMF) $(DESTDIR)$(sbindir)/apctest@EXEEXT@ + @$(RMF) $(DESTDIR)$(sbindir)/powerflute@EXEEXT@ clean: targetclean $(RM) -f devicedbg diff -auNr apcupsd-3.9.9-clean/src/cgi/Makefile.in apcupsd-3.9.9/src/cgi/Makefile.in --- apcupsd-3.9.9-clean/src/cgi/Makefile.in Tue Apr 30 15:02:40 2002 +++ apcupsd-3.9.9/src/cgi/Makefile.in Wed Sep 11 02:48:47 2002 @@ -58,40 +58,40 @@ install: all-targets @for p in $(allexe) ; do \ - echo $(INSTALL_PROGRAM) $$p $(cgibin); \ - $(INSTALL_PROGRAM) $$p $(cgibin); \ + echo $(INSTALL_PROGRAM) $$p $(DESTDIR)$(cgibin); \ + $(INSTALL_PROGRAM) $$p $(DESTDIR)$(cgibin); \ done @if test "x$(CSS_DIR)" != "x" ; then \ - if test -d $(CSS_DIR) ; then \ - $(INSTALL_DATA) multimon.css $(CSS_DIR) ; \ + if test -d $(DESTDIR)$(CSS_DIR) ; then \ + $(INSTALL_DATA) multimon.css $(DESTDIR)$(CSS_DIR) ; \ else \ - echo "CSS_DIR $(CSS_DIR) not found, did not install multimon.css" ; \ + echo "CSS_DIR $(DESTDIR)$(CSS_DIR) not found, did not install multimon.css" ; \ fi \ else \ echo "No CSS_DIR found, did not install multimon.css" ; \ fi # don't overwrite any existing config file - @if test ! -f $(sysconfdir)/hosts.conf; then \ - (echo "Installing hosts.conf..." && $(INSTALL_DATA) ../etc/hosts.conf $(sysconfdir)/hosts.conf); \ + @if test ! -f $(DESTDIR)$(sysconfdir)/hosts.conf; then \ + (echo "Installing hosts.conf..." && $(INSTALL_DATA) ../etc/hosts.conf $(DESTDIR)$(sysconfdir)/hosts.conf); \ else \ - (echo "Installing hosts.conf in $(sysconfdir)/hosts.conf.new" && $(INSTALL_DATA) ../etc/hosts.conf $(sysconfdir)/hosts.conf.new); \ + (echo "Installing hosts.conf in $(DESTDIR)$(sysconfdir)/hosts.conf.new" && $(INSTALL_DATA) ../etc/hosts.conf $(DESTDIR)$(sysconfdir)/hosts.conf.new); \ fi # don't overwrite any existing config file - @if test ! -f $(sysconfdir)/multimon.conf; then \ - (echo "Installing multimon.conf..." && $(INSTALL_DATA) ../etc/multimon.conf $(sysconfdir)/multimon.conf); \ + @if test ! -f $(DESTDIR)$(sysconfdir)/multimon.conf; then \ + (echo "Installing multimon.conf..." && $(INSTALL_DATA) ../etc/multimon.conf $(DESTDIR)$(sysconfdir)/multimon.conf); \ else \ - (echo "Installing multimon.conf in $(sysconfdir)/multimon.conf.new" && $(INSTALL_DATA) ../etc/multimon.conf $(sysconfdir)/multimon.conf.new); \ + (echo "Installing multimon.conf in $(DESTDIR)$(sysconfdir)/multimon.conf.new" && $(INSTALL_DATA) ../etc/multimon.conf $(DESTDIR)$(sysconfdir)/multimon.conf.new); \ fi uninstall: @echo "Uninstalling cgi program support..." @for p in $(allexe) ; do \ - rm -f $(cgibin)/$$p; \ + $(RMF) $(DESTDIR)$(cgibin)/$$p; \ done - rm -f $(sysconfdir)/hosts.conf - rm -f $(sysconfdir)/hosts.conf.new - rm -f $(sysconfdir)/multimon.conf - rm -f $(sysconfdir)/multimon.conf.new + $(RMF) $(DESTDIR)$(sysconfdir)/hosts.conf + $(RMF) $(DESTDIR)$(sysconfdir)/hosts.conf.new + $(RMF) $(DESTDIR)$(sysconfdir)/multimon.conf + $(RMF) $(DESTDIR)$(sysconfdir)/multimon.conf.new # ----------------------------------------------------------------------- # DO NOT DELETE THIS LINE -- make depend depends on it. diff -auNr apcupsd-3.9.9-clean/src/intl/Makefile.in apcupsd-3.9.9/src/intl/Makefile.in --- apcupsd-3.9.9-clean/src/intl/Makefile.in Tue Apr 30 16:42:19 2002 +++ apcupsd-3.9.9/src/intl/Makefile.in Wed Sep 11 02:48:47 2002 @@ -94,26 +94,26 @@ if test "$(PACKAGE)" = "gettext" \ && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ if test -r $(MKINSTALLDIRS); then \ - $(MKINSTALLDIRS) $(libdir) $(includedir); \ + $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ else \ - $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ fi; \ - $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \ - $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \ + $(INSTALL_DATA) intlh.inst $(DESTDIR)$(includedir)/libintl.h; \ + $(INSTALL_DATA) libintl.a $(DESTDIR)$(libdir)/libintl.a; \ else \ : ; \ fi install-data: all if test "$(PACKAGE)" = "gettext"; then \ if test -r $(MKINSTALLDIRS); then \ - $(MKINSTALLDIRS) $(gettextsrcdir); \ + $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ else \ - $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ fi; \ - $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \ + $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ dists="$(DISTFILES.common)"; \ for file in $$dists; do \ - $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \ + $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(gettextsrcdir)/$$file; \ done; \ else \ : ; \ @@ -125,7 +125,7 @@ uninstall: dists="$(DISTFILES.common)"; \ for file in $$dists; do \ - rm -f $(gettextsrcdir)/$$file; \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ done info dvi: diff -auNr apcupsd-3.9.9-clean/src/po/Makefile.in apcupsd-3.9.9/src/po/Makefile.in --- apcupsd-3.9.9-clean/src/po/Makefile.in Fri Apr 19 12:50:11 2002 +++ apcupsd-3.9.9/src/po/Makefile.in Wed Sep 11 02:48:47 2002 @@ -77,16 +77,16 @@ install-data-yes: all @$(ECHO) "Installing catalog data ..." @if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(datadir); \ + $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ fi @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ case "$$cat" in \ - *.gmo) destdir=$(gnulocaledir);; \ - *) destdir=$(localedir);; \ + *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \ + *) destdir=$(DESTDIR)$(localedir);; \ esac; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ dir=$$destdir/$$lang/LC_MESSAGES; \ @@ -119,12 +119,12 @@ done @if test "$(PACKAGE)" = "gettext"; then \ if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(gettextsrcdir); \ + $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ fi; \ $(INSTALL_DATA) Makefile.in \ - $(gettextsrcdir)/Makefile.in; \ + $(DESTDIR)$(gettextsrcdir)/Makefile.in; \ else \ : ; \ fi @@ -135,12 +135,12 @@ for cat in $$catalogs; do \ cat=`basename $$cat`; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - $(RMF) $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ - $(RMF) $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ - $(RMF) $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ - $(RMF) $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ + $(RMF) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ + $(RMF) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ + $(RMF) $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ + $(RMF) $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ done - @$(RM) -f $(gettextsrcdir)/Makefile.in + @$(RM) -f $(DESTDIR)$(gettextsrcdir)/Makefile.in cat-id-tbl.o: ../intl/libgettext.h