nut-DESTDIR.patch

   1 diff -Nru nut-0.44.1/Makefile.in nut-0.44.1.new/Makefile.in
   2 --- nut-0.44.1/Makefile.in      Sun Jul 30 05:10:14 2000
   3 +++ nut-0.44.1.new/Makefile.in  Fri Dec 22 06:03:57 2000
   4 @@ -2,10 +2,9 @@
   5
   6  # directory definitions
   7  prefix=@prefix@
   8 -BASEPATH = $(INSTALLROOT)@prefix@
   9 -CONFPATH = $(INSTALLROOT)@sysconfdir@
  10 -CGIPATH = $(INSTALLROOT)@CGIPATH@
  11 -INSTALLDIRS=$(CONFPATH) $(CGIPATH) $(MODELPATH) $(BASEPATH)/bin $(BASEPATH)/misc
  12 +BASEPATH = @prefix@
  13 +CONFPATH = @sysconfdir@
  14 +CGIPATH = @CGIPATH@
  15
  16  STATEPATH = $(INSTALLROOT)@STATEPATH@
  17  SUBDIRS = common models server clients
  18 @@ -40,33 +39,22 @@
  19                 rm $$i/Makefile; \
  20         done
  21
  22 -install: install-dirs
  23 -       @echo Installing in $(BASEPATH)...
  24 +install:
  25 +       @echo Installing in $(DESTDIR)$(BASEPATH)...
  26
  27         @for i in $(SUBDIRS) conf; do \
  28 -               cd $$i; $(MAKE) install; cd ..; \
  29 +               cd $$i; $(MAKE) DESTDIR=$(DESTDIR) install; cd ..; \
  30         done
  31
  32 -install-dirs:
  33 -       @for d in $(INSTALLDIRS); do \
  34 -               if (test ! -d $$d) then \
  35 -                       $(INSTALLCMD) -d $$d || exit 1; \
  36 -               fi \
  37 -       done
  38 -
  39 -       @if (test ! -d $(STATEPATH)) then \
  40 -               $(INSTALLCMD) -d $(STATEPATH) -o $(RUNUID) -g $(RUNGID) || exit 1; \
  41 -       fi
  42 -
  43  cgi:
  44         @cd clients; $(MAKE) cgi; cd ..;
  45
  46 -install-cgi: install-dirs
  47 +install-cgi:
  48         @cd conf; $(MAKE) install; cd ..;
  49 -       @cd clients; $(MAKE) install-cgi; cd ..;
  50 +       @cd clients; $(MAKE) DESTDIR=$(DESTDIR) install-cgi; cd ..;
  51
  52 -install-misc: install-dirs
  53 -       @cd clients; $(MAKE) install-misc; cd ..;
  54 +install-misc:
  55 +       @cd clients; $(MAKE) DESTDIR=$(DESTDIR) install-misc; cd ..;
  56
  57  # This is only used to set the "official" version before it goes out the door.
  58  #
  59 diff -Nru nut-0.44.1/clients/Makefile.in nut-0.44.1.new/clients/Makefile.in
  60 --- nut-0.44.1/clients/Makefile.in      Fri Jul 14 00:55:41 2000
  61 +++ nut-0.44.1.new/clients/Makefile.in  Fri Dec 22 05:58:58 2000
  62 @@ -4,9 +4,9 @@
  63  CFLAGS = -I../include @CFLAGS@
  64  PROGS = upsc upslog upsct upsct2 upscmd upsmon
  65  CGIPROGS = upsstats.cgi upsimage.cgi multimon.cgi upsset.cgi
  66 -prefix = $(INSTALLROOT)@prefix@
  67 +prefix = @prefix@
  68  BASEPATH = $(prefix)
  69 -CGIPATH = $(INSTALLROOT)@CGIPATH@
  70 +CGIPATH = @CGIPATH@
  71  NETLIBS = @NETLIBS@
  72  INSTALLCMD = @INSTALL@
  73  INSTALLMODE = 0755
  74 @@ -56,15 +56,17 @@
  75  distclean: clean
  76
  77  install: all
  78 +       $(INSTALLCMD) -d $(DESTDIR)$(BASEPATH)/bin
  79         @for f in $(PROGS) ; do \
  80 -               $(INSTALLCMD) -m $(INSTALLMODE) $$f $(BASEPATH)/bin; \
  81 +               $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(BASEPATH)/bin; \
  82         done
  83
  84  install-cgi: cgi
  85 +       $(INSTALLCMD) -d $(DESTDIR)$(CGIPATH)
  86         @for f in $(CGIPROGS) ; do \
  87 -               $(INSTALLCMD) -m $(INSTALLMODE) $$f $(CGIPATH); \
  88 +               $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(CGIPATH); \
  89         done
  90
  91  install-misc: upsfetch.o
  92 -       $(INSTALLCMD) upsfetch.h $(BASEPATH)/misc
  93 -       $(INSTALLCMD) upsfetch.o $(BASEPATH)/misc
  94 +       $(INSTALLCMD) upsfetch.h $(DESTDIR)$(BASEPATH)/misc
  95 +       $(INSTALLCMD) upsfetch.o $(DESTDIR)$(BASEPATH)/misc
  96 diff -Nru nut-0.44.1/conf/Makefile.in nut-0.44.1.new/conf/Makefile.in
  97 --- nut-0.44.1/conf/Makefile.in Sun May  7 23:17:20 2000
  98 +++ nut-0.44.1.new/conf/Makefile.in     Fri Dec 22 05:59:45 2000
  99 @@ -1,8 +1,8 @@
 100  # Network UPS Tools: conf
 101
 102  prefix = @prefix@
 103 -BASEPATH = $(INSTALLROOT)@prefix@
 104 -CONFPATH = $(INSTALLROOT)@sysconfdir@
 105 +BASEPATH = @prefix@
 106 +CONFPATH = @sysconfdir@
 107  INSTALLCMD = @INSTALL@
 108
 109  SECFILES = upsmon.conf upsd.conf upsset.passwd
 110 @@ -12,11 +12,12 @@
 111  clean:
 112
 113  install:
 114 +       $(INSTALLCMD) -d $(DESTDIR)$(CONFPATH)
 115         @for f in $(SECFILES) ; do \
 116                 if [ -f $(CONFPATH)/$$f ]; then \
 117                         echo "Preserving existing config file: $$f"; \
 118                 else \
 119 -                       $(INSTALLCMD) -m 0600 $$f $(CONFPATH); \
 120 +                       $(INSTALLCMD) -m 0600 $$f $(DESTDIR)$(CONFPATH); \
 121                 fi; \
 122         done
 123
 124 @@ -24,6 +25,6 @@
 125                 if [ -f $(CONFPATH)/$$f ]; then \
 126                         echo "Preserving existing config file: $$f"; \
 127                 else \
 128 -                       $(INSTALLCMD) -m 0644 $$f $(CONFPATH); \
 129 +                       $(INSTALLCMD) -m 0644 $$f $(DESTDIR)$(CONFPATH); \
 130                 fi; \
 131         done
 132 diff -Nru nut-0.44.1/models/Makefile.in nut-0.44.1.new/models/Makefile.in
 133 --- nut-0.44.1/models/Makefile.in       Sun Aug 20 00:39:02 2000
 134 +++ nut-0.44.1.new/models/Makefile.in   Fri Dec 22 06:00:40 2000
 135 @@ -4,11 +4,11 @@
 136  CFLAGS = -I../include @CFLAGS@
 137  PROGS  = ups-trust425+625 apcsmart fentonups genericups optiups bestups \
 138           victronups ipt-anzen bestfort mustekups engetron belkin powercom
 139 -prefix = $(INSTALLROOT)@prefix@
 140 +prefix = @prefix@
 141  BASEPATH = $(prefix)
 142  INSTALLCMD = @INSTALL@
 143  INSTALLMODE = 0755
 144 -MODELPATH = $(INSTALLROOT)@MODELPATH@
 145 +MODELPATH = @MODELPATH@
 146
 147  all: $(PROGS)
 148
 149 @@ -37,10 +37,7 @@
 150  distclean: clean
 151
 152  install: all
 153 -       if (test ! -d $(MODELPATH)) then \
 154 -               $(INSTALLCMD) -d $(MODELPATH) || exit 1; \
 155 -       fi
 156 -
 157 +       $(INSTALLCMD) -d $(DESTDIR)$(MODELPATH)
 158         @for f in $(PROGS) ; do \
 159 -               $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MODELPATH); \
 160 +               $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MODELPATH); \
 161         done
 162 diff -Nru nut-0.44.1/server/Makefile.in nut-0.44.1.new/server/Makefile.in
 163 --- nut-0.44.1/server/Makefile.in       Fri Jul 14 00:30:40 2000
 164 +++ nut-0.44.1.new/server/Makefile.in   Fri Dec 22 06:01:40 2000
 165 @@ -3,7 +3,7 @@
 166  CC = @CC@
 167  CFLAGS = -I../include @CFLAGS@
 168  PROGS = upsd
 169 -prefix = $(INSTALLROOT)@prefix@
 170 +prefix = @prefix@
 171  BASEPATH = $(prefix)
 172  NETLIBS = @NETLIBS@
 173  INSTALLCMD = @INSTALL@
 174 @@ -23,6 +23,7 @@
 175  distclean: clean
 176
 177  install: all
 178 +       $(INSTALLCMD) -d $(DESTDIR)$(BASEPATH)
 179         @for f in $(PROGS) ; do \
 180 -               $(INSTALLCMD) $$f $(BASEPATH)/bin; \
 181 +               $(INSTALLCMD) $$f $(DESTDIR)$(BASEPATH)/bin; \
 182         done