Merge remote-tracking branch 'erik/sendEmail' into core67-merge

[people/teissler/ipfire-2.x.git] / lfs / motion

diff --git a/lfs/motion b/lfs/motion
index d6d0bcc90cd0c3e1ad647995a29e2c98aedea8bc..fa99ea0b15b00bb456c04c1888ff4dff38a3ff4b 100644 (file)
--- a/lfs/motion
+++ b/lfs/motion
@@ -77,11 +77,19 @@ dist:
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+       #Install obsolete V4L1 videodev.h
+       cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videodev.h
+
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cp -vf $(DIR_SRC)/config/motion/motion.conf /etc
-       mkdir -pv /srv/motion/cam1
-       echo Folder for cam1 images > /srv/motion/cam1/info
+       install -v -m 644 $(DIR_SRC)/config/backup/includes/motion \
+                        /var/ipfire/backup/addons/includes/motion
+
+       #Remove obsolete V4L1 videodev.h
+       rm -f /usr/include/linux/videodev.h
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)