amanda-am_fixes.patch

   1 diff -Nru amanda-2.4.2/Makefile.am amanda-2.4.2.new/Makefile.am
   2 --- amanda-2.4.2/Makefile.am    Wed Nov 22 14:39:10 2000
   3 +++ amanda-2.4.2.new/Makefile.am        Fri Jan 19 07:07:44 2001
   4 @@ -36,12 +36,10 @@
   5         $(PLOT_SUBDIRS) \
   6         man docs example
   7
   8 -pkgdata_DATA = \
   9 +EXTRA_DIST = $(SNAPSHOT_STAMP) \
  10         COPYRIGHT                       \
  11         COPYRIGHT-APACHE                \
  12 -       COPYRIGHT-REGEX
  13 -
  14 -EXTRA_DIST = $(SNAPSHOT_STAMP) \
  15 +       COPYRIGHT-REGEX                 \
  16         contrib/README                  \
  17         contrib/dbbackup.README         \
  18         contrib/dbbackup.ksh            \
  19 diff -Nru amanda-2.4.2/amplot/Makefile.am amanda-2.4.2.new/amplot/Makefile.am
  20 --- amanda-2.4.2/amplot/Makefile.am     Fri Jan 19 07:07:01 2001
  21 +++ amanda-2.4.2.new/amplot/Makefile.am Fri Jan 19 07:06:35 2001
  22 @@ -22,23 +22,3 @@
  23                         echo "pause -1;" >> amplot.gp.new
  24                         rm -f amplot.gp
  25                         mv amplot.gp.new amplot.gp
  26 -
  27 -install-exec-hook:
  28 -       @list="$(sbin_SCRIPTS)"; \
  29 -       for p in $$list; do \
  30 -               pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
  31 -               echo chown $(BINARY_OWNER) $$pa; \
  32 -               chown $(BINARY_OWNER) $$pa; \
  33 -               echo chgrp $(SETUID_GROUP) $$pa; \
  34 -               chgrp $(SETUID_GROUP) $$pa; \
  35 -       done
  36 -
  37 -install-data-hook:
  38 -       @list="$(amplot_DATA)"; \
  39 -       for p in $$list; do \
  40 -               pa=$(DESTDIR)$(libexecdir)/$$p; \
  41 -               echo chown $(BINARY_OWNER) $$pa; \
  42 -               chown $(BINARY_OWNER) $$pa; \
  43 -               echo chgrp $(SETUID_GROUP) $$pa; \
  44 -               chgrp $(SETUID_GROUP) $$pa; \
  45 -        done
  46 diff -Nru amanda-2.4.2/changer-src/Makefile.am amanda-2.4.2.new/changer-src/Makefile.am
  47 --- amanda-2.4.2/changer-src/Makefile.am        Fri Jan 19 07:07:01 2001
  48 +++ amanda-2.4.2.new/changer-src/Makefile.am    Fri Jan 19 07:06:35 2001
  49 @@ -41,21 +41,3 @@
  50  .sh:
  51                         cat $< > $@
  52                         chmod a+x $@
  53 -
  54 -install-exec-hook:
  55 -       @list="$(sbin_PROGRAMS) $(sbin_SCRIPTS)"; \
  56 -       for p in $$list; do \
  57 -               pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
  58 -               echo chown $(BINARY_OWNER) $$pa; \
  59 -               chown $(BINARY_OWNER) $$pa; \
  60 -               echo chgrp $(SETUID_GROUP) $$pa; \
  61 -               chgrp $(SETUID_GROUP) $$pa; \
  62 -       done
  63 -       @list="$(libexec_PROGRAMS) $(libexec_SCRIPTS)"; \
  64 -       for p in $$list; do \
  65 -               pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
  66 -               echo chown $(BINARY_OWNER) $$pa; \
  67 -               chown $(BINARY_OWNER) $$pa; \
  68 -               echo chgrp $(SETUID_GROUP) $$pa; \
  69 -               chgrp $(SETUID_GROUP) $$pa; \
  70 -       done
  71 diff -Nru amanda-2.4.2/client-src/Makefile.am amanda-2.4.2.new/client-src/Makefile.am
  72 --- amanda-2.4.2/client-src/Makefile.am Fri Jan 19 07:07:01 2001
  73 +++ amanda-2.4.2.new/client-src/Makefile.am     Fri Jan 19 07:06:35 2001
  74 @@ -57,22 +57,6 @@
  75  noinst_HEADERS =       amandates.h     getfsent.h      findpass.h
  76
  77  install-exec-hook:
  78 -       @list="$(sbin_SCRIPTS)"; \
  79 -       for p in $$list; do \
  80 -               pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
  81 -               echo chown $(BINARY_OWNER) $$pa; \
  82 -               chown $(BINARY_OWNER) $$pa; \
  83 -               echo chgrp $(SETUID_GROUP) $$pa; \
  84 -               chgrp $(SETUID_GROUP) $$pa; \
  85 -       done
  86 -       @list="$(libexec_PROGRAMS) $(libexec_SCRIPTS)"; \
  87 -       for p in $$list; do \
  88 -               pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
  89 -               echo chown $(BINARY_OWNER) $$pa; \
  90 -               chown $(BINARY_OWNER) $$pa; \
  91 -               echo chgrp $(SETUID_GROUP) $$pa; \
  92 -               chgrp $(SETUID_GROUP) $$pa; \
  93 -       done
  94         @list="$(libexecdir)/calcsize $(libexecdir)/killpgrp $(libexecdir)/rundump $(libexecdir)/runtar"; \
  95         for p in $$list; do \
  96                 if echo "$(sbin_SCRIPTS) $(libexec_PROGRAMS) $(libexec_SCRIPTS)" | grep `basename $$p` >/dev/null 2>&1; then \
  97 diff -Nru amanda-2.4.2/docs/Makefile.am amanda-2.4.2.new/docs/Makefile.am
  98 --- amanda-2.4.2/docs/Makefile.am       Fri Jan 19 07:07:01 2001
  99 +++ amanda-2.4.2.new/docs/Makefile.am   Fri Jan 19 07:06:35 2001
 100 @@ -1,5 +1,5 @@
 101  ## Process this file with automake to produce Makefile.in
 102 -pkgdata_DATA = \
 103 +EXTRA_DIST = \
 104         DUMPER-API              \
 105         FAQ                     \
 106         INDEXING                \
 107 diff -Nru amanda-2.4.2/man/Makefile.am amanda-2.4.2.new/man/Makefile.am
 108 --- amanda-2.4.2/man/Makefile.am        Fri Jan 19 07:07:01 2001
 109 +++ amanda-2.4.2.new/man/Makefile.am    Fri Jan 19 07:06:35 2001
 110 @@ -42,13 +42,3 @@
 111            $(SERVER_MAN_PAGES) \
 112            $(RECOVER_MAN_PAGES) \
 113            $(RESTORE_MAN_PAGES)
 114 -
 115 -install-data-hook:
 116 -       @list="$(man_MANS)"; \
 117 -       for p in $$list; do \
 118 -               pa=$(DESTDIR)$(mandir)/man8/`echo $$p|sed '$(transform)'`; \
 119 -               echo chown $(BINARY_OWNER) $$pa; \
 120 -               chown $(BINARY_OWNER) $$pa; \
 121 -               echo chgrp $(SETUID_GROUP) $$pa; \
 122 -               chgrp $(SETUID_GROUP) $$pa; \
 123 -       done
 124 diff -Nru amanda-2.4.2/recover-src/Makefile.am amanda-2.4.2.new/recover-src/Makefile.am
 125 --- amanda-2.4.2/recover-src/Makefile.am        Fri Jan 19 07:07:01 2001
 126 +++ amanda-2.4.2.new/recover-src/Makefile.am    Fri Jan 19 07:06:35 2001
 127 @@ -24,18 +24,6 @@
 128
 129  YFLAGS =               -d
 130
 131 -install-exec-hook:
 132 -       @list="$(sbin_PROGRAMS)"; \
 133 -       for p in $$list; do \
 134 -               pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
 135 -               echo chown $(BINARY_OWNER) $$pa; \
 136 -               chown $(BINARY_OWNER) $$pa; \
 137 -               echo chgrp $(SETUID_GROUP) $$pa; \
 138 -               chgrp $(SETUID_GROUP) $$pa; \
 139 -               echo chmod o-rwx $$pa; \
 140 -               chmod o-rwx $$pa; \
 141 -       done
 142 -
 143  # so that uscan.c is never generated before uparse.h
 144  # otherwise we might have makedepend problems
 145  $(srcdir)/uscan.c: $(srcdir)/uparse.h
 146 diff -Nru amanda-2.4.2/restore-src/Makefile.am amanda-2.4.2.new/restore-src/Makefile.am
 147 --- amanda-2.4.2/restore-src/Makefile.am        Fri Jan 19 07:07:01 2001
 148 +++ amanda-2.4.2.new/restore-src/Makefile.am    Fri Jan 19 07:06:35 2001
 149 @@ -16,21 +16,3 @@
 150         ../common-src/libamanda.$(LIB_EXTENSION)
 151
 152  amidxtaped_SOURCES =   amidxtaped.c
 153 -
 154 -install-exec-hook:
 155 -       @list="$(sbin_PROGRAMS)"; \
 156 -       for p in $$list; do \
 157 -               pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
 158 -               echo chown $(BINARY_OWNER) $$pa; \
 159 -               chown $(BINARY_OWNER) $$pa; \
 160 -               echo chgrp $(SETUID_GROUP) $$pa; \
 161 -               chgrp $(SETUID_GROUP) $$pa; \
 162 -       done
 163 -       @list="$(libexec_PROGRAMS)"; \
 164 -       for p in $$list; do \
 165 -               pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
 166 -               echo chown $(BINARY_OWNER) $$pa; \
 167 -               chown $(BINARY_OWNER) $$pa; \
 168 -               echo chgrp $(SETUID_GROUP) $$pa; \
 169 -               chgrp $(SETUID_GROUP) $$pa; \
 170 -       done
 171 diff -Nru amanda-2.4.2/server-src/Makefile.am amanda-2.4.2.new/server-src/Makefile.am
 172 --- amanda-2.4.2/server-src/Makefile.am Fri Jan 19 07:07:01 2001
 173 +++ amanda-2.4.2.new/server-src/Makefile.am     Fri Jan 19 07:06:35 2001
 174 @@ -64,22 +64,6 @@
 175                         tapefile.h      find.h          server_util.h
 176
 177  install-exec-hook:
 178 -       @list="$(sbin_PROGRAMS) $(sbin_SCRIPTS)"; \
 179 -       for p in $$list; do \
 180 -               pa=$(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
 181 -               echo chown $(BINARY_OWNER) $$pa; \
 182 -               chown $(BINARY_OWNER) $$pa; \
 183 -               echo chgrp $(SETUID_GROUP) $$pa; \
 184 -               chgrp $(SETUID_GROUP) $$pa; \
 185 -       done
 186 -       @list="$(libexec_PROGRAMS) $(libexec_SCRIPTS)"; \
 187 -       for p in $$list; do \
 188 -               pa=$(DESTDIR)$(libexecdir)/`echo $$p|sed '$(transform)'`; \
 189 -               echo chown $(BINARY_OWNER) $$pa; \
 190 -               chown $(BINARY_OWNER) $$pa; \
 191 -               echo chgrp $(SETUID_GROUP) $$pa; \
 192 -               chgrp $(SETUID_GROUP) $$pa; \
 193 -       done
 194         @list="$(sbindir)/amcheck $(libexecdir)/dumper $(libexecdir)/planner"; \
 195         for p in $$list; do \
 196                 if echo "$(sbin_PROGRAMS) $(sbin_SCRIPTS) $(libexec_PROGRAMS) $(libexec_SCRIPTS)" | grep `basename $$p` >/dev/null 2>&1; then \