diff options
| author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2009-12-14 01:42:49 +0000 |
|---|---|---|
| committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2009-12-14 01:42:49 +0000 |
| commit | 0d725d9b97dd6de2da90db7ddfa8eca48ad69760 (patch) | |
| tree | 758f0ad5b1eebaa30df33c3595c443f72daa51f4 /misc/amanda26-server/files | |
| parent | Update to 0.2.1 (diff) | |
- Upgrade to 2.6.1p2.
Notes
Notes:
svn path=/head/; revision=245741
Diffstat (limited to 'misc/amanda26-server/files')
| -rw-r--r-- | misc/amanda26-server/files/patch-common-src::Makefile.in | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/misc/amanda26-server/files/patch-common-src::Makefile.in b/misc/amanda26-server/files/patch-common-src::Makefile.in index 0f26a0f8e04c..9da99a06935e 100644 --- a/misc/amanda26-server/files/patch-common-src::Makefile.in +++ b/misc/amanda26-server/files/patch-common-src::Makefile.in @@ -1,6 +1,6 @@ ---- 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 @@ +--- common-src/Makefile.in.orig 2009-11-06 05:11:37.000000000 +0900 ++++ common-src/Makefile.in 2009-12-14 10:29:52.479439079 +0900 +@@ -1091,6 +1091,7 @@ sbin_SCRIPTS_PERL = \ $(sbin_CHECK_PERL) @@ -8,7 +8,7 @@ amlibexec_CHECK_PERL = amlibexec_SCRIPTS_PERL = \ -@@ -1084,6 +1085,7 @@ +@@ -1101,6 +1102,7 @@ amaespipe \ amcrypt-ossl \ amcrypt-ossl-asym @@ -16,28 +16,34 @@ amlibexec_SCRIPTS_SHELL = SCRIPTS_INCLUDE = \ -@@ -1137,15 +1139,15 @@ +@@ -1155,18 +1157,18 @@ versuff.c: $(top_builddir)/config.status $(srcdir)/versuff.c.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-amlibLTLIBRARIES: $(amlib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(amlibdir)" || $(MKDIR_P) "$(DESTDIR)$(amlibdir)" -- @list='$(amlib_LTLIBRARIES)'; for p in $$list; do \ +- @list='$(amlib_LTLIBRARIES)'; test -n "$(amlibdir)" || list=; \ +- list2=; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- 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"; \ +- list2="$$list2 $$p"; \ - else :; fi; \ -- done +- done; \ +- test -z "$$list2" || { \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(amlibdir)'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(amlibdir)"; \ +- } +@WANT_CLIENT_TRUE@ @$(NORMAL_INSTALL) +@WANT_CLIENT_TRUE@ test -z "$(amlibdir)" || $(MKDIR_P) "$(DESTDIR)$(amlibdir)" -+@WANT_CLIENT_TRUE@ @list='$(amlib_LTLIBRARIES)'; for p in $$list; do \ ++@WANT_CLIENT_TRUE@ @list='$(amlib_LTLIBRARIES)'; test -n "$(amlibdir)" || list=; \ ++@WANT_CLIENT_TRUE@ list2=; 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) $(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@ list2="$$list2 $$p"; \ +@WANT_CLIENT_TRUE@ else :; fi; \ -+@WANT_CLIENT_TRUE@ done ++@WANT_CLIENT_TRUE@ done; \ ++@WANT_CLIENT_TRUE@ test -z "$$list2" || { \ ++@WANT_CLIENT_TRUE@ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(amlibdir)'"; \ ++@WANT_CLIENT_TRUE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(amlibdir)"; \ ++@WANT_CLIENT_TRUE@ } uninstall-amlibLTLIBRARIES: @$(NORMAL_UNINSTALL) |