multimedia/gphoto2/patches/001-automake-compat.patch

   1 Index: gphoto2-2.5.15/Makefile.am
   2 ===================================================================
   3 --- gphoto2-2.5.15.orig/Makefile.am
   4 +++ gphoto2-2.5.15/Makefile.am
   5 @@ -1,4 +1,4 @@
   6 -SUBDIRS = gphoto-m4 contrib doc gphoto2 packaging po tests
   7 +SUBDIRS = gphoto-m4 contrib doc gphoto2 packaging tests
   8
   9  ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4
  10  EXTRA_DIST = README.md
  11 Index: gphoto2-2.5.15/Makefile.in
  12 ===================================================================
  13 --- gphoto2-2.5.15.orig/Makefile.in
  14 +++ gphoto2-2.5.15/Makefile.in
  15 @@ -389,7 +389,7 @@ target_alias = @target_alias@
  16  top_build_prefix = @top_build_prefix@
  17  top_builddir = @top_builddir@
  18  top_srcdir = @top_srcdir@
  19 -SUBDIRS = gphoto-m4 contrib doc gphoto2 packaging po tests
  20 +SUBDIRS = gphoto-m4 contrib doc gphoto2 packaging tests
  21  ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4
  22  EXTRA_DIST = README.md
  23  all: config.h
  24 Index: gphoto2-2.5.15/configure.ac
  25 ===================================================================
  26 --- gphoto2-2.5.15.orig/configure.ac
  27 +++ gphoto2-2.5.15/configure.ac
  28 @@ -58,10 +58,7 @@ dnl ------------------------------------
  29  GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}])
  30  ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id is it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW"
  31  AM_GNU_GETTEXT_VERSION([0.14.1])
  32 -AM_GNU_GETTEXT([external])
  33 -AM_PO_SUBDIRS()
  34  AM_ICONV()
  35 -GP_GETTEXT_FLAGS()
  36
  37  dnl We cannot use AC_DEFINE_UNQUOTED() for these definitions, as
  38  dnl we require make to do insert the proper $(datadir) value
  39 @@ -407,7 +404,6 @@ AC_SUBST([AM_LDFLAGS])
  40  # Create output files
  41  # ---------------------------------------------------------------------------
  42  AC_CONFIG_FILES([
  43 -po/Makefile.in
  44  Makefile
  45  gphoto2/Makefile
  46  gphoto-m4/Makefile