Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

This commit is contained in:
Michael Tremer
2008-03-31 21:45:26 +02:00
3 changed files with 4 additions and 3 deletions

0
config/vdr/etc/channels.conf Executable file → Normal file
View File

View File

@@ -75,11 +75,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
cd $(DIR_APP) && cp -Rvf $(DIR_SRC)/config/ovpn /var/ipfire
-mkdir -p /var/ipfire/ovpn/ca
-mkdir -p /var/ipfire/ovpn/crls
chown -R nobody:nobody /var/ipfire/ovpn
chown root.nobody /var/log/ovpnserver.log
chmod 755 /var/ipfire/ovpn/verify
chmod 660 /var/log/ovpnserver.log
chmod 700 /var/ipfire/ovpn/certs
-cd $(DIR_APP) && find /var/ipfire/ovpn -name .svn -exec rm -rf {} \;
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -85,8 +85,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make VIDEODIR=/var/video plugins $(MAKETUNING)
cd $(DIR_APP) && make VIDEODIR=/var/video vdr $(MAKETUNING)
cd $(DIR_APP) && make PREFIX=. DESTDIR=/opt/vdr/ install
-mkdir -p /var/video/plugins/
-mkdir -p /opt/vdr/etc
cd $(DIR_APP) && install *.conf /opt/vdr/etc/
cp -f $(DIR_SRC)/config/vdr/* /opt/vdr/
cp -Rvf $(DIR_SRC)/config/vdr /opt
@rm -rf $(DIR_APP)
@$(POSTBUILD)