Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 7778 | Differences between
and this patch

Collapse All | Expand All

(-)apcupsd-3.9.9-clean/Makefile.in (-16 / +16 lines)
Lines 24-54 Link Here
24
install: install-directories install-subdirs
24
install: install-directories install-subdirs
25
25
26
install-directories: install-dir@CGI@
26
install-directories: install-dir@CGI@
27
	@if [ ! -d /tmp ] ; then \
27
	@if [ ! -d $(DESTDIR)/tmp ] ; then \
28
		$(SHELL) $(MKINSTALLDIRS) /tmp \
28
		$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)/tmp \
29
		chmod 777 /tmp; \
29
		chmod 777 $(DESTDIR)/tmp; \
30
	fi
30
	fi
31
	@if [ ! -d $(prefix) ] ; then \
31
	@if [ ! -d $(DESTDIR)$(prefix) ] ; then \
32
		$(SHELL) $(MKINSTALLDIRS) $(prefix) \
32
		$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(prefix) \
33
		chmod 755 $(prefix); \
33
		chmod 755 $(DESTDIR)$(prefix); \
34
	fi
34
	fi
35
	@if [ ! -d $(prefix) ] ; then \
35
	@if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then \
36
		$(SHELL) $(MKINSTALLDIRS) $(prefix) \
36
		$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(exec_prefix) \
37
		chmod 755 $(prefix); \
37
		chmod 755 $(DESTDIR)$(exec_prefix); \
38
	fi
38
	fi
39
	@if [ ! -d $(sbindir) ] ; then \
39
	@if [ ! -d $(DESTDIR)$(sbindir) ] ; then \
40
		$(SHELL) $(MKINSTALLDIRS) $(sbindir) \
40
		$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
41
		chmod 755 $(sbindir); \
41
		chmod 755 $(DESTDIR)$(sbindir); \
42
	fi
42
	fi
43
	@if [ ! -d $(sysconfdir) ] ; then \
43
	@if [ ! -d $(DESTDIR)$(sysconfdir) ] ; then \
44
		$(SHELL) $(MKINSTALLDIRS) $(sysconfdir) \
44
		$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) \
45
		chmod 755 $(sysconfdir); \
45
		chmod 755 $(DESTDIR)$(sysconfdir); \
46
	fi
46
	fi
47
47
48
install-dir: dummy
48
install-dir: dummy
49
49
50
install-dircgi:
50
install-dircgi:
51
	@$(SHELL) $(MKINSTALLDIRS)  $(cgibin)
51
	@$(SHELL) $(MKINSTALLDIRS)  $(DESTDIR)$(cgibin)
52
52
53
uninstall: uninstall-subdirs
53
uninstall: uninstall-subdirs
54
54
(-)apcupsd-3.9.9-clean/autoconf/configure.in (+12 lines)
Lines 1043-1048 Link Here
1043
elif test -f /etc/slackware-version
1043
elif test -f /etc/slackware-version
1044
then
1044
then
1045
	DISTNAME=slackware
1045
	DISTNAME=slackware
1046
elif test -f /etc/gentoo-version
1047
then
1048
	DISTNAME=gentoo
1046
elif test -f /etc/engarde-version
1049
elif test -f /etc/engarde-version
1047
then
1050
then
1048
	DISTNAME=engarde
1051
	DISTNAME=engarde
Lines 1192-1197 Link Here
1192
		platforms/freebsd/apccontrol.sh \
1195
		platforms/freebsd/apccontrol.sh \
1193
		"
1196
		"
1194
  ;;
1197
  ;;
1198
gentoo)
1199
	DISTVER=`uname -r`
1200
	DFILES="\
1201
		platforms/apccontrol \
1202
		platforms/gentoo/Makefile \
1203
		platforms/gentoo/apcupsd \
1204
		platforms/gentoo/halt \
1205
		"
1206
  ;;
1195
hpux)
1207
hpux)
1196
	DISTVER=`uname -r`
1208
	DISTVER=`uname -r`
1197
	DFILES="\
1209
	DFILES="\
(-)apcupsd-3.9.9-clean/doc/Makefile.in (-3 / +3 lines)
Lines 20-31 Link Here
20
20
21
install-man: apcupsd.man
21
install-man: apcupsd.man
22
	@$(ECHO) "Installing manual pages..."
22
	@$(ECHO) "Installing manual pages..."
23
	@$(SHELL) $(MKINSTALLDIRS) $(mandir)
23
	@$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
24
	@$(INSTALL_DATA) apcupsd.man $(mandir)/apcupsd.$(manext)
24
	@$(INSTALL_DATA) apcupsd.man $(DESTDIR)$(mandir)/apcupsd.$(manext)
25
25
26
uninstall:
26
uninstall:
27
	@$(ECHO) "Removing manual page ..."
27
	@$(ECHO) "Removing manual page ..."
28
	@$(RM) -f $(mandir)/apcupsd.$(manext)
28
	@$(RM) -f $(DESTDIR)$(mandir)/apcupsd.$(manext)
29
29
30
clean: targetclean
30
clean: targetclean
31
31
(-)apcupsd-3.9.9-clean/examples/Makefile.in (-1 / +1 lines)
Lines 38-44 Link Here
38
38
39
install:
39
install:
40
	@echo "Installing examples ..."
40
	@echo "Installing examples ..."
41
	@$(CP) -rp $(topdir)/examples $(sysconfdir)
41
	@$(CP) -rp $(DESTDIR)$(topdir)/examples $(sysconfdir)
42
42
43
uninstall:
43
uninstall:
44
44
(-)apcupsd-3.9.9-clean/platforms/Makefile.in (-4 / +7 lines)
Lines 21-36 Link Here
21
#
21
#
22
install-distdir:
22
install-distdir:
23
	(cd $(DISTNAME); \
23
	(cd $(DISTNAME); \
24
	$(MAKE) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" install);
24
	$(MAKE) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" install); \
25
	./install-symlinks.sh install $(DISTNAME)
25
	./install-symlinks.sh install $(DISTNAME)
26
26
27
install: @INSTALL_DISTDIR@
27
install: @INSTALL_DISTDIR@
28
	@echo "Installing apccontrol script..."
28
	@echo "Installing apccontrol script..."
29
	@if test -f ./$(DISTNAME)/apccontrol; then \
29
	@if test -f ./$(DISTNAME)/apccontrol; then \
30
		$(INSTALL_PROGRAM) -m 744 ./$(DISTNAME)/apccontrol $(sysconfdir)/apccontrol; \
30
		$(INSTALL_PROGRAM) -m 744 ./$(DISTNAME)/apccontrol \
31
			$(DESTDIR)$(sysconfdir)/apccontrol; \
31
	else \
32
	else \
32
		$(INSTALL_PROGRAM) -m 744 ./apccontrol $(sysconfdir)/apccontrol; \
33
		$(INSTALL_PROGRAM) -m 744 ./apccontrol \
34
			$(DESTDIR)$(sysconfdir)/apccontrol; \
33
	fi
35
	fi
36
	(cd etc; $(MAKE) install)
34
37
35
#
38
#
36
# uninstall symlinks before removing the boot script etc etc
39
# uninstall symlinks before removing the boot script etc etc
Lines 41-47 Link Here
41
	$(MAKE) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" uninstall);
44
	$(MAKE) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" uninstall);
42
45
43
uninstall: @UNINSTALL_DISTDIR@
46
uninstall: @UNINSTALL_DISTDIR@
44
	rm -f $(sysconfdir)/apccontrol
47
	rm -f $(DESTDIR)$(sysconfdir)/apccontrol
45
48
46
clean: targetclean
49
clean: targetclean
47
50
(-)apcupsd-3.9.9-clean/platforms/etc/Makefile.in (-5 / +10 lines)
Lines 19-33 Link Here
19
19
20
install:
20
install:
21
	@echo "Installing apcupsd.conf..."; \
21
	@echo "Installing apcupsd.conf..."; \
22
	srcconf=$(topdir)/etc/apcupsd.conf; \
22
	srcconf=apcupsd.conf; \
23
	if test -f $(sysconfdir)/apcupsd.conf; then \
23
	if test -f $(DESTDIR)$(sysconfdir)/apcupsd.conf; then \
24
	  dstconf=apcupsd.conf.new; \
24
	  dstconf=apcupsd.conf.new; \
25
	  echo " Found old apcupsd.conf, installing new conf file as $$dstconf"; \
25
	  echo " Found old apcupsd.conf, installing new file as $$dstconf"; \
26
	else \
26
	else \
27
	  dstconf=apcupsd.conf; \
27
	  dstconf=apcupsd.conf; \
28
	fi; \
28
	fi; \
29
	echo "$(INSTALL_DATA) $$srcconf $(sysconfdir)/$$dstconf"; \
29
	echo "$(INSTALL_DATA) $$srcconf $(DESTDIR)$(sysconfdir)/$$dstconf"; \
30
		$(INSTALL_DATA) $$srcconf $(sysconfdir)/$$dstconf
30
		$(INSTALL_DATA) $$srcconf $(DESTDIR)$(sysconfdir)/$$dstconf; \
31
	for src in changeme commfailure commok masterconnect \
32
		mastertimeout mainsback onbattery; do \
33
		echo "$(INSTALL_PROGRAM) $$src $(DESTDIR)$(sysconfdir)/$$src"; \
34
		$(INSTALL_PROGRAM) $$src $(DESTDIR)$(sysconfdir)/$$src; \
35
	done
31
36
32
uninstall:
37
uninstall:
33
38
(-)apcupsd-3.9.9-clean/platforms/gentoo/Makefile.in (+31 lines)
Line 0 Link Here
1
# Makefile template
2
#
3
# Copyright (C) 1999-2002 Riccardo Facchetti <riccardo@master.oasi.gpa.it>
4
#
5
6
# Default variables
7
@VARIABLES@
8
# TOP source directory.
9
topdir = @top_srcdir@
10
top_builddir = $(topdir)
11
12
# Include the default make targets: to be put before the all-targets: rule.
13
@TARGETS@
14
15
all-targets: Makefile
16
17
install:
18
	@echo "Installing apcupsd boot scripts..."
19
	$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)/etc/init.d; \
20
	$(INSTALL_PROGRAM) apcupsd $(DESTDIR)/etc/init.d/apcupsd
21
	$(INSTALL_PROGRAM) halt $(DESTDIR)/etc/init.d/halt
22
23
uninstall:
24
	@echo "Removing boot scripts..."
25
	@$(RMF) $(DESTDIR)/etc/init.d/apcupsd
26
#	@$(RMF) $(DESTDIR)/etc/init.d/halt
27
28
clean:
29
30
distclean:
31
	@$(RMF) apcupsd Makefile 
(-)apcupsd-3.9.9-clean/platforms/gentoo/apcupsd.in (+20 lines)
Line 0 Link Here
1
#!/sbin/runscript
2
# Copyright 1999-2002 Gentoo Technologies, Inc.
3
# Distributed under the terms of the GNU General Public License, v2 or later
4
# $Header: /home/cvsroot/gentoo-x86/sys-apps/apcupsd/files/apcupsd,v 1.4 2001/12/23 23:25:19 azarah Exp $
5
6
APCPID=@PIDDIR@/apcupsd.pid
7
APCUPSD=@sbindir@/apcupsd
8
9
start() {
10
	rm -f /etc/apcupsd/powerfail
11
	ebegin "Starting APC UPS daemon"
12
	start-stop-daemon --start --quiet --exec $APCUPSD -- 1>&2
13
	eend $?
14
}
15
 
16
stop() {
17
	ebegin "Stopping APC UPS daemon"
18
	start-stop-daemon --stop --quiet --pidfile $APCPID
19
	eend $?
20
} 
(-)apcupsd-3.9.9-clean/platforms/gentoo/halt.in (+24 lines)
Line 0 Link Here
1
#!/bin/sh
2
#
3
# halt		Execute the halt command.
4
#
5
# Version:      @(#)halt  2.75  19-May-1998  miquels@cistron.nl
6
#               modified by Holger Brueckner <darks@gentoo.org>
7
#               for apcupsd 28-June-2001
8
9
PATH=/sbin:/bin:/usr/sbin:/usr/bin
10
APCCONTROL="/etc/apcupsd/apccontrol killpower" 
11
12
# See if we need to cut the power.
13
14
# See if this is a powerfail situation.
15
if [ -f /etc/apcupsd/powerfail ]; then
16
  echo "APCUPSD to the Rescue!"
17
  echo
18
  $APCCONTROL
19
  echo
20
  sleep 120
21
  exit 1
22
fi
23
24
/sbin/halt -nfip
(-)apcupsd-3.9.9-clean/src/Makefile.in (-11 / +14 lines)
Lines 61-68 Link Here
61
61
62
install-binary: $(allexe)
62
install-binary: $(allexe)
63
	@$(ECHO) "Installing daemons ..."
63
	@$(ECHO) "Installing daemons ..."
64
	@$(SHELL) $(MKINSTALLDIRS) $(sbindir)
64
	@$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
65
	@$(INSTALL_PROGRAM) -s -m 700 apcupsd@EXEEXT@ $(sbindir)/apcupsd@EXEEXT@
65
	@$(INSTALL_PROGRAM) -s -m 700 apcupsd@EXEEXT@ \
66
		$(DESTDIR)$(sbindir)/apcupsd@EXEEXT@
66
	@$(MAKE) install-@APCNISD@
67
	@$(MAKE) install-@APCNISD@
67
	@$(MAKE) install-@APCACCESS@
68
	@$(MAKE) install-@APCACCESS@
68
	@$(MAKE) install-@SMTP@
69
	@$(MAKE) install-@SMTP@
Lines 70-94 Link Here
70
71
71
install-apcaccess:
72
install-apcaccess:
72
	@$(INSTALL_PROGRAM) -s -m 755 apcaccess@EXEEXT@ \
73
	@$(INSTALL_PROGRAM) -s -m 755 apcaccess@EXEEXT@ \
73
									$(sbindir)/apcaccess@EXEEXT@
74
		$(DESTDIR)$(sbindir)/apcaccess@EXEEXT@
74
75
75
install-smtp:
76
install-smtp:
76
	@$(INSTALL_PROGRAM) -s -m 755 smtp@EXEEXT@ $(sbindir)/smtp@EXEEXT@
77
	@$(INSTALL_PROGRAM) -s -m 755 smtp@EXEEXT@ \
78
		$(DESTDIR)$(sbindir)/smtp@EXEEXT@
77
79
78
install-apcnisd:
80
install-apcnisd:
79
	@$(INSTALL_PROGRAM) -s -m 700 apcnisd@EXEEXT@ $(sbindir)/apcnisd@EXEEXT@
81
	@$(INSTALL_PROGRAM) -s -m 700 apcnisd@EXEEXT@ \
82
		$(DESTDIR)$(sbindir)/apcnisd@EXEEXT@
80
83
81
install-powerflute:
84
install-powerflute:
82
	@$(INSTALL_PROGRAM) -s -m 755 powerflute@EXEEXT@ \
85
	@$(INSTALL_PROGRAM) -s -m 755 powerflute@EXEEXT@ \
83
									$(sbindir)/powerflute@EXEEXT@
86
		$(DESTDIR)$(sbindir)/powerflute@EXEEXT@
84
87
85
uninstall:
88
uninstall:
86
	@$(ECHO) "Removing daemons ..."
89
	@$(ECHO) "Removing daemons ..."
87
	@$(RM) -f $(sbindir)/apcupsd@EXEEXT@
90
	@$(RMF) $(DESTDIR)$(sbindir)/apcupsd@EXEEXT@
88
	@$(RM) -f $(sbindir)/apcnisd@EXEEXT@
91
	@$(RMF) $(DESTDIR)$(sbindir)/apcnisd@EXEEXT@
89
	@$(RM) -f $(sbindir)/apcaccess@EXEEXT@
92
	@$(RMF) $(DESTDIR)$(sbindir)/apcaccess@EXEEXT@
90
	@$(RM) -f $(sbindir)/apctest@EXEEXT@
93
	@$(RMF) $(DESTDIR)$(sbindir)/apctest@EXEEXT@
91
	@$(RM) -f $(sbindir)/powerflute@EXEEXT@
94
	@$(RMF) $(DESTDIR)$(sbindir)/powerflute@EXEEXT@
92
95
93
clean: targetclean
96
clean: targetclean
94
	$(RM) -f devicedbg
97
	$(RM) -f devicedbg
(-)apcupsd-3.9.9-clean/src/cgi/Makefile.in (-16 / +16 lines)
Lines 58-97 Link Here
58
58
59
install: all-targets
59
install: all-targets
60
	@for p in $(allexe) ; do \
60
	@for p in $(allexe) ; do \
61
		echo $(INSTALL_PROGRAM) $$p $(cgibin); \
61
		echo $(INSTALL_PROGRAM) $$p $(DESTDIR)$(cgibin); \
62
		$(INSTALL_PROGRAM) $$p $(cgibin); \
62
		$(INSTALL_PROGRAM) $$p $(DESTDIR)$(cgibin); \
63
	done
63
	done
64
	@if test "x$(CSS_DIR)" != "x" ; then \
64
	@if test "x$(CSS_DIR)" != "x" ; then \
65
	   if test -d $(CSS_DIR) ; then \
65
	   if test -d $(DESTDIR)$(CSS_DIR) ; then \
66
	      $(INSTALL_DATA) multimon.css $(CSS_DIR) ; \
66
	      $(INSTALL_DATA) multimon.css $(DESTDIR)$(CSS_DIR) ; \
67
	   else \
67
	   else \
68
	      echo "CSS_DIR $(CSS_DIR) not found, did not install multimon.css" ; \
68
	      echo "CSS_DIR $(DESTDIR)$(CSS_DIR) not found, did not install multimon.css" ; \
69
	   fi \
69
	   fi \
70
	else \
70
	else \
71
	   echo "No CSS_DIR found, did not install multimon.css" ; \
71
	   echo "No CSS_DIR found, did not install multimon.css" ; \
72
	fi
72
	fi
73
	# don't overwrite any existing config file
73
	# don't overwrite any existing config file
74
	@if test ! -f $(sysconfdir)/hosts.conf; then \
74
	@if test ! -f $(DESTDIR)$(sysconfdir)/hosts.conf; then \
75
		(echo "Installing hosts.conf..." && $(INSTALL_DATA) ../etc/hosts.conf $(sysconfdir)/hosts.conf); \
75
		(echo "Installing hosts.conf..." && $(INSTALL_DATA) ../etc/hosts.conf $(DESTDIR)$(sysconfdir)/hosts.conf); \
76
	else \
76
	else \
77
	       (echo "Installing hosts.conf in $(sysconfdir)/hosts.conf.new" && $(INSTALL_DATA) ../etc/hosts.conf $(sysconfdir)/hosts.conf.new); \
77
	       (echo "Installing hosts.conf in $(DESTDIR)$(sysconfdir)/hosts.conf.new" && $(INSTALL_DATA) ../etc/hosts.conf $(DESTDIR)$(sysconfdir)/hosts.conf.new); \
78
	fi
78
	fi
79
	# don't overwrite any existing config file
79
	# don't overwrite any existing config file
80
	@if test ! -f $(sysconfdir)/multimon.conf; then \
80
	@if test ! -f $(DESTDIR)$(sysconfdir)/multimon.conf; then \
81
		(echo "Installing multimon.conf..." && $(INSTALL_DATA) ../etc/multimon.conf $(sysconfdir)/multimon.conf); \
81
		(echo "Installing multimon.conf..." && $(INSTALL_DATA) ../etc/multimon.conf $(DESTDIR)$(sysconfdir)/multimon.conf); \
82
	else \
82
	else \
83
	       (echo "Installing multimon.conf in $(sysconfdir)/multimon.conf.new" && $(INSTALL_DATA) ../etc/multimon.conf $(sysconfdir)/multimon.conf.new); \
83
	       (echo "Installing multimon.conf in $(DESTDIR)$(sysconfdir)/multimon.conf.new" && $(INSTALL_DATA) ../etc/multimon.conf $(DESTDIR)$(sysconfdir)/multimon.conf.new); \
84
	fi
84
	fi
85
85
86
uninstall:
86
uninstall:
87
	@echo "Uninstalling cgi program support..."
87
	@echo "Uninstalling cgi program support..."
88
	@for p in $(allexe) ; do \
88
	@for p in $(allexe) ; do \
89
		rm -f $(cgibin)/$$p; \
89
		$(RMF) $(DESTDIR)$(cgibin)/$$p; \
90
	done
90
	done
91
	rm -f $(sysconfdir)/hosts.conf
91
	$(RMF) $(DESTDIR)$(sysconfdir)/hosts.conf
92
	rm -f $(sysconfdir)/hosts.conf.new
92
	$(RMF) $(DESTDIR)$(sysconfdir)/hosts.conf.new
93
	rm -f $(sysconfdir)/multimon.conf
93
	$(RMF) $(DESTDIR)$(sysconfdir)/multimon.conf
94
	rm -f $(sysconfdir)/multimon.conf.new
94
	$(RMF) $(DESTDIR)$(sysconfdir)/multimon.conf.new
95
95
96
# -----------------------------------------------------------------------
96
# -----------------------------------------------------------------------
97
# DO NOT DELETE THIS LINE -- make depend depends on it.
97
# DO NOT DELETE THIS LINE -- make depend depends on it.
(-)apcupsd-3.9.9-clean/src/intl/Makefile.in (-9 / +9 lines)
Lines 94-119 Link Here
94
	if test "$(PACKAGE)" = "gettext" \
94
	if test "$(PACKAGE)" = "gettext" \
95
	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
95
	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
96
	  if test -r $(MKINSTALLDIRS); then \
96
	  if test -r $(MKINSTALLDIRS); then \
97
	    $(MKINSTALLDIRS) $(libdir) $(includedir); \
97
	    $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
98
	  else \
98
	  else \
99
	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
99
	    $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
100
	  fi; \
100
	  fi; \
101
	  $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
101
	  $(INSTALL_DATA) intlh.inst $(DESTDIR)$(includedir)/libintl.h; \
102
	  $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
102
	  $(INSTALL_DATA) libintl.a $(DESTDIR)$(libdir)/libintl.a; \
103
	else \
103
	else \
104
	  : ; \
104
	  : ; \
105
	fi
105
	fi
106
install-data: all
106
install-data: all
107
	if test "$(PACKAGE)" = "gettext"; then \
107
	if test "$(PACKAGE)" = "gettext"; then \
108
	  if test -r $(MKINSTALLDIRS); then \
108
	  if test -r $(MKINSTALLDIRS); then \
109
	    $(MKINSTALLDIRS) $(gettextsrcdir); \
109
	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
110
	  else \
110
	  else \
111
	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
111
	    $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
112
	  fi; \
112
	  fi; \
113
	  $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
113
	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
114
	  dists="$(DISTFILES.common)"; \
114
	  dists="$(DISTFILES.common)"; \
115
	  for file in $$dists; do \
115
	  for file in $$dists; do \
116
	    $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
116
	    $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(gettextsrcdir)/$$file; \
117
	  done; \
117
	  done; \
118
	else \
118
	else \
119
	  : ; \
119
	  : ; \
Lines 125-131 Link Here
125
uninstall:
125
uninstall:
126
	dists="$(DISTFILES.common)"; \
126
	dists="$(DISTFILES.common)"; \
127
	for file in $$dists; do \
127
	for file in $$dists; do \
128
	  rm -f $(gettextsrcdir)/$$file; \
128
	  rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
129
	done
129
	done
130
130
131
info dvi:
131
info dvi:
(-)apcupsd-3.9.9-clean/src/po/Makefile.in (-12 / +12 lines)
Lines 77-92 Link Here
77
install-data-yes: all
77
install-data-yes: all
78
	@$(ECHO) "Installing catalog data ..."
78
	@$(ECHO) "Installing catalog data ..."
79
	@if test -r "$(MKINSTALLDIRS)"; then \
79
	@if test -r "$(MKINSTALLDIRS)"; then \
80
	  $(MKINSTALLDIRS) $(datadir); \
80
	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
81
	else \
81
	else \
82
	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
82
	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
83
	fi
83
	fi
84
	@catalogs='$(CATALOGS)'; \
84
	@catalogs='$(CATALOGS)'; \
85
	for cat in $$catalogs; do \
85
	for cat in $$catalogs; do \
86
	  cat=`basename $$cat`; \
86
	  cat=`basename $$cat`; \
87
	  case "$$cat" in \
87
	  case "$$cat" in \
88
	    *.gmo) destdir=$(gnulocaledir);; \
88
	    *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
89
	    *)     destdir=$(localedir);; \
89
	    *)     destdir=$(DESTDIR)$(localedir);; \
90
	  esac; \
90
	  esac; \
91
	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
91
	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
92
	  dir=$$destdir/$$lang/LC_MESSAGES; \
92
	  dir=$$destdir/$$lang/LC_MESSAGES; \
Lines 119-130 Link Here
119
	done
119
	done
120
	@if test "$(PACKAGE)" = "gettext"; then \
120
	@if test "$(PACKAGE)" = "gettext"; then \
121
	  if test -r "$(MKINSTALLDIRS)"; then \
121
	  if test -r "$(MKINSTALLDIRS)"; then \
122
	    $(MKINSTALLDIRS) $(gettextsrcdir); \
122
	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
123
	  else \
123
	  else \
124
	    $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
124
	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
125
	  fi; \
125
	  fi; \
126
	  $(INSTALL_DATA) Makefile.in \
126
	  $(INSTALL_DATA) Makefile.in \
127
			  $(gettextsrcdir)/Makefile.in; \
127
			  $(DESTDIR)$(gettextsrcdir)/Makefile.in; \
128
	else \
128
	else \
129
	  : ; \
129
	  : ; \
130
	fi
130
	fi
Lines 135-146 Link Here
135
	for cat in $$catalogs; do \
135
	for cat in $$catalogs; do \
136
	  cat=`basename $$cat`; \
136
	  cat=`basename $$cat`; \
137
	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
137
	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
138
	  $(RMF) $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
138
	  $(RMF) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
139
	  $(RMF) $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
139
	  $(RMF) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
140
	  $(RMF) $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
140
	  $(RMF) $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
141
	  $(RMF) $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
141
	  $(RMF) $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
142
	done
142
	done
143
	@$(RM) -f $(gettextsrcdir)/Makefile.in
143
	@$(RM) -f $(DESTDIR)$(gettextsrcdir)/Makefile.in
144
144
145
cat-id-tbl.o: ../intl/libgettext.h
145
cat-id-tbl.o: ../intl/libgettext.h
146
146

Return to bug 7778