nginx: Add openssl dependency. Also fix parallel build.

[openwrt/svn-archive/archive.git] / multimedia / gphoto2 / Makefile

diff --git a/multimedia/gphoto2/Makefile b/multimedia/gphoto2/Makefile
index 633b0a6913bc8e747e7c3749a1cec08f30f7e5c9..0063a5a3c01b0e119f395c0564875e28327c7c45 100644 (file)
--- a/multimedia/gphoto2/Makefile
+++ b/multimedia/gphoto2/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,27 +8,28 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gphoto2
-PKG_VERSION:=2.4.5
+PKG_VERSION:=2.4.9
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/gphoto
-PKG_MD5SUM:=cccbe437804c863b87807444ec58a8ac
+PKG_MD5SUM:=a08a93a425cde03ca8f9bade83bbd26a
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/gphoto2
   SECTION:=multimedia
   CATEGORY:=Multimedia
-  DEPENDS:=+libgphoto2 +libpopt +libpthread
   TITLE:=Gphoto Digital Camera Control
   URL:=http://www.gphoto.org/
+  DEPENDS:=+libgphoto2 +libpopt +libpthread
 endef
 
 define Package/gphoto2/description
-       For downloading and controlling digital cameras
+ For downloading and controlling digital cameras
 endef
 
 CONFIGURE_ARGS += \
@@ -46,7 +47,7 @@ CONFIGURE_VARS += \
 
 define Package/gphoto2/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/gphoto2/$(PKG_NAME) $(1)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,gphoto2))