summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-20 18:32:11 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-20 18:32:11 +0000
commitb02969aed07be552589a5f7df43ee072d638f43a (patch)
tree28a3293abb28e3a8eb72ff27563857f2c326f81c
parent1911c67d0b7ab581da7fe6bfd526597baf4955b0 (diff)
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
-rw-r--r--package/Makefile2
-rw-r--r--package/motion/Makefile12
2 files changed, 7 insertions, 7 deletions
diff --git a/package/Makefile b/package/Makefile
index eaf9bf43c..049a47a99 100644
--- 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 578d35be1..1cc30398e 100644
--- 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