|
From: <kr...@us...> - 2007-04-18 21:14:15
|
Revision: 867
http://svn.sourceforge.net/astlinux/?rev=867&view=rev
Author: krisk84
Date: 2007-04-18 14:14:12 -0700 (Wed, 18 Apr 2007)
Log Message:
-----------
minihttpd and asterisk build fixes
Modified Paths:
--------------
branches/s2s/package/asterisk/asterisk.mk
branches/s2s/package/minihttpd/minihttpd.mk
Modified: branches/s2s/package/asterisk/asterisk.mk
===================================================================
--- branches/s2s/package/asterisk/asterisk.mk 2007-04-18 19:29:23 UTC (rev 866)
+++ branches/s2s/package/asterisk/asterisk.mk 2007-04-18 21:14:12 UTC (rev 867)
@@ -112,8 +112,8 @@
-rm $(TARGET_DIR)/stat/var/lib/asterisk/mohmp3/*
ifneq ($(wildcard package/asterisk/config/extensions.conf),)
mkdir -p $(TARGET_DIR)/stat/etc/asterisk
- cp -a package/asterisk/config/* $(TARGET_DIR)/stat/etc/asterisk
- else
+ rsync -a --exclude=".svn" package/asterisk/config/* $(TARGET_DIR)/stat/etc/asterisk
+else
mv $(TARGET_DIR)/etc/asterisk $(TARGET_DIR)/stat/etc/
endif
$(INSTALL) -D -m 0755 package/asterisk/logger.conf $(TARGET_DIR)/stat/etc/asterisk/logger.conf
@@ -145,6 +145,9 @@
rm -f $(TARGET_DIR)/etc/init.d/asterisk
rm -f $(TARGET_DIR)/usr/sbin/stereorize
rm -f $(TARGET_DIR)/usr/sbin/streamplayer
+ rm -Rf $(TARGET_DIR)/stat/var/lib/asterisk
+ rm -Rf $(TARGET_DIR)/stat/var/spool/asterisk
+ rm -Rf $(TARGET_DIR)/stat/etc/asterisk
-$(MAKE) -C $(ASTERISK_DIR) clean
-rm $(BUILD_DIR)/asterisk
Modified: branches/s2s/package/minihttpd/minihttpd.mk
===================================================================
--- branches/s2s/package/minihttpd/minihttpd.mk 2007-04-18 19:29:23 UTC (rev 866)
+++ branches/s2s/package/minihttpd/minihttpd.mk 2007-04-18 21:14:12 UTC (rev 867)
@@ -33,7 +33,7 @@
$(INSTALL) -D $(MINIHTTPD_DIR)/$(MINIHTTPD_BINARY) $(TARGET_DIR)/usr/$(MINIHTTPD_TARGET_BINARY)
$(INSTALL) -D $(MINIHTTPD_DIR)/htpasswd $(TARGET_DIR)/usr/bin/htpasswd
mkdir -p $(TARGET_DIR)/stat/var
- cp -a package/minihttpd/www $(TARGET_DIR)/stat/var/
+ rsync -a --exclude=".svn" package/minihttpd/www $(TARGET_DIR)/stat/var/
$(INSTALL) -D -m 0755 package/minihttpd/mini_httpd.init $(TARGET_DIR)/etc/init.d/mini_httpd
ln -sf /tmp/etc/mini_httpd.conf $(TARGET_DIR)/etc/mini_httpd.conf
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|