[packages/amanda.git] / amanda-am_fixes.patch

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