fix motion package

aka - clean up someone elses's mess

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3419 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/Makefile b/package/Makefile
index eaf9bf4..049a47a 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -439,7 +439,7 @@ mini_httpd-compile: openssl-compile
 endif
 
 ifneq ($(BR2_PACKAGE_MOTION),)
-motion-compile: libjpeg-compile
+motion-compile: jpeg-compile
 endif
 
 ifneq ($(BR2_PACKAGE_MPD_MP3),)

diff --git a/package/motion/Makefile b/package/motion/Makefile
index 578d35b..1cc3039 100644 (file)
--- a/package/motion/Makefile
+++ b/package/motion/Makefile
@@ -35,15 +35,15 @@ $(PKG_BUILD_DIR)/.built:
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
-               install_prefix="$(PKG_INSTALL_DIR)" \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
        touch $@
 
-$(IPKG_FOO):
-       install -d -m0755 $(IDIR_FOO)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/motion $(IDIR_FOO)/usr/sbin
-       $(RSTRIP) $(IDIR_FOO)
-       $(IPKG_BUILD) $(IDIR_FOO) $(PACKAGE_DIR)
+$(IPKG_MOTION):
+       install -d -m0755 $(IDIR_MOTION)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/motion $(IDIR_MOTION)/usr/bin
+       $(RSTRIP) $(IDIR_MOTION)
+       $(IPKG_BUILD) $(IDIR_MOTION) $(PACKAGE_DIR)
 
 mostlyclean:
        make -C $(PKG_BUILD_DIR) clean