summaryrefslogtreecommitdiff
path: root/misc/amanda32-server/files/patch-common-src::Makefile.in
diff options
context:
space:
mode:
authorJun Kuriyama <kuriyama@FreeBSD.org>2009-02-04 22:55:46 +0000
committerJun Kuriyama <kuriyama@FreeBSD.org>2009-02-04 22:55:46 +0000
commit128a9e143018f18d73286013d1d23438eaa6f224 (patch)
tree7020e7d3b9ac6600b4321b28a1ca83789f21478d /misc/amanda32-server/files/patch-common-src::Makefile.in
parentUpdate to 1.2.1 (diff)
- Upgrade to 2.6.1.
- Turn on SSH auth by default. - Sorry, previous default path of $AMANDA_DATES was typo. Fixed here it should be. Please take care when upgrading. PR: ports/131193 (partially merged to my update modifications) [1] Submitted by: Goran Lowkrantz <glz@hidden-powers.com> [1]
Notes
Notes: svn path=/head/; revision=227635
Diffstat (limited to 'misc/amanda32-server/files/patch-common-src::Makefile.in')
-rw-r--r--misc/amanda32-server/files/patch-common-src::Makefile.in27
1 files changed, 14 insertions, 13 deletions
diff --git a/misc/amanda32-server/files/patch-common-src::Makefile.in b/misc/amanda32-server/files/patch-common-src::Makefile.in
index 099a8ffb5dec..0f26a0f8e04c 100644
--- a/misc/amanda32-server/files/patch-common-src::Makefile.in
+++ b/misc/amanda32-server/files/patch-common-src::Makefile.in
@@ -1,21 +1,22 @@
---- common-src/Makefile.in.orig 2008-08-23 03:20:00.000000000 +0900
-+++ common-src/Makefile.in 2008-09-01 07:42:20.000000000 +0900
-@@ -926,12 +926,14 @@
+--- common-src/Makefile.in.orig 2009-01-22 22:51:24.000000000 +0900
++++ common-src/Makefile.in 2009-01-27 07:25:59.000000000 +0900
+@@ -1074,6 +1074,7 @@
+
sbin_SCRIPTS_PERL = \
- amgpgcrypt \
- amcryptsimple
+ $(sbin_CHECK_PERL)
+@WANT_SERVER_TRUE@sbin_SCRIPTS_PERL =
- sbin_SCRIPTS_SHELL = \
- amcrypt \
+ amlibexec_CHECK_PERL =
+ amlibexec_SCRIPTS_PERL = \
+@@ -1084,6 +1085,7 @@
amaespipe \
amcrypt-ossl \
amcrypt-ossl-asym
+@WANT_SERVER_TRUE@sbin_SCRIPTS_SHELL =
- amlibexec_SCRIPTS_PERL =
+ amlibexec_SCRIPTS_SHELL =
SCRIPTS_INCLUDE = \
-@@ -985,15 +987,15 @@
+@@ -1137,15 +1139,15 @@
versuff.c: $(top_builddir)/config.status $(srcdir)/versuff.c.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-amlibLTLIBRARIES: $(amlib_LTLIBRARIES)
@@ -24,8 +25,8 @@
- @list='$(amlib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \
+- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \
+- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \
- else :; fi; \
- done
+@WANT_CLIENT_TRUE@ @$(NORMAL_INSTALL)
@@ -33,8 +34,8 @@
+@WANT_CLIENT_TRUE@ @list='$(amlib_LTLIBRARIES)'; for p in $$list; do \
+@WANT_CLIENT_TRUE@ if test -f $$p; then \
+@WANT_CLIENT_TRUE@ f=$(am__strip_dir) \
-+@WANT_CLIENT_TRUE@ echo " $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \
-+@WANT_CLIENT_TRUE@ $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \
++@WANT_CLIENT_TRUE@ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \
++@WANT_CLIENT_TRUE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \
+@WANT_CLIENT_TRUE@ else :; fi; \
+@WANT_CLIENT_TRUE@ done