Changeset 5930

Timestamp:

03/25/10 18:14:57 (3 years ago)

Author:

jow

Message:

luci-0.9: merge r5902, r5903

Location:

luci/branches/luci-0.9

Files:

• contrib/package/luci/Makefile (modified) (3 diffs)
• libs/sgi-uhttpd (copied) (copied from luci/trunk/libs/sgi-uhttpd)
• libs/sgi-uhttpd/luasrc (copied) (copied from luci/trunk/libs/sgi-uhttpd/luasrc)
• libs/sgi-uhttpd/luasrc/sgi (copied) (copied from luci/trunk/libs/sgi-uhttpd/luasrc/sgi)
• libs/sgi-uhttpd/luasrc/sgi/uhttpd.lua (copied) (copied from luci/trunk/libs/sgi-uhttpd/luasrc/sgi/uhttpd.lua)
• libs/sgi-uhttpd/Makefile (copied) (copied from luci/trunk/libs/sgi-uhttpd/Makefile)

luci/branches/luci-0.9/contrib/package/luci/Makefile

@@ -665 +665 @@
 endef
 
+define Package/luci-sgi-uhttpd
+  $(call Package/luci/webservertemplate)
+  TITLE:=Binding for the uHTTPd server
+  DEPENDS+=+uhttpd
+endef
+
+define Package/luci-sgi-uhttpd/install
+    $(call Package/luci/install/template,$(1),libs/sgi-uhttpd)
+endef
+
+
 ### Themes ###
 define Package/luci-theme-base
@@ -1009 +1020 @@
 ifneq ($(CONFIG_PACKAGE_luci-sgi-cgi),)
     PKG_SELECTED_MODULES+=libs/sgi-cgi
+endif
+ifneq ($(CONFIG_PACKAGE_luci-sgi-uhttpd),)
+    PKG_SELECTED_MODULES+=libs/sgi-uhttpd
 endif
 ifneq ($(CONFIG_PACKAGE_luci-sgi-luci),)
@@ -1127 +1141 @@
 
 $(eval $(call BuildPackage,luci-sgi-cgi))
+$(eval $(call BuildPackage,luci-sgi-uhttpd))
 
 $(eval $(call BuildPackage,luci-theme-base))