packages/libs/libgphoto2/patches/001-automake-compat.patch
jow bfd815717c [packages] libgphoto2: set SHELL to fix libtool invocation on various hosts
git-svn-id: svn://svn.openwrt.org/openwrt/packages@24663 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-12-18 13:04:11 +00:00

54 lines
1.3 KiB
Diff

--- a/configure.ac
+++ b/configure.ac
@@ -227,7 +227,6 @@ ALL_LINGUAS="da de es eu fr hu it ja nl
GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],[The gPhoto Team],[${MAIL_GPHOTO_TRANSLATION}])
AM_GNU_GETTEXT_VERSION([0.14.1])
AM_GNU_GETTEXT([external])
-AM_PO_SUBDIRS()
AM_ICONV()
GP_GETTEXT_FLAGS()
--- a/libgphoto2_port/configure.ac
+++ b/libgphoto2_port/configure.ac
@@ -116,7 +116,6 @@ GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2
ALL_LINGUAS="cs da de fr es eu it ja nl pl pt_BR ru sk sv uk vi zh_CN zh_TW"
AM_GNU_GETTEXT_VERSION([0.14.1])
AM_GNU_GETTEXT([external])
-AM_PO_SUBDIRS()
AM_ICONV()
GP_GETTEXT_FLAGS()
--- a/libgphoto2_port/libgphoto2_port/Makefile.in
+++ b/libgphoto2_port/libgphoto2_port/Makefile.in
@@ -14,6 +14,8 @@
@SET_MAKE@
+SHELL = @SHELL@
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
--- a/libgphoto2_port/Makefile.in
+++ b/libgphoto2_port/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-
+SHELL = @SHELL@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,7 +19,7 @@
########################################################################
# put file lists and special compile rules here
-
+SHELL = @SHELL@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@