* Made Makefiles attribute aware

This commit is contained in:
Steven Barth 2008-06-09 07:56:20 +00:00
parent 0042134833
commit 64806f32be
10 changed files with 5 additions and 12 deletions

View file

@ -30,7 +30,7 @@ luahost: luabuild hostcopy
hostcopy: hostcopy:
mkdir -p host mkdir -p host
for i in $(MODULES); do cp $$i/dist/* host/ -R 2>/dev/null || true; done for i in $(MODULES); do cp -a $$i/dist/* host/ -R 2>/dev/null || true; done
rm -f host/luci rm -f host/luci
ln -s .$(LUCI_INSTALLDIR) host/luci ln -s .$(LUCI_INSTALLDIR) host/luci

0
applications/luci-fw/root/etc/init.d/luci_fw Normal file → Executable file
View file

View file

View file

@ -13,8 +13,8 @@ clean: luaclean
luasource: luasource:
mkdir -p dist$(LUCI_INSTALLDIR) mkdir -p dist$(LUCI_INSTALLDIR)
cp root/* dist -R 2>/dev/null || true cp -a root/* dist -R 2>/dev/null || true
cp luasrc/* dist$(LUCI_INSTALLDIR) -R 2>/dev/null || true cp -a luasrc/* dist$(LUCI_INSTALLDIR) -R 2>/dev/null || true
for i in $$(find dist -name .svn); do rm $$i -rf; done for i in $$(find dist -name .svn); do rm $$i -rf; done
luacompile: luasource luacompile: luasource

View file

@ -62,7 +62,8 @@ endef
define Package/luci/install/template define Package/luci/install/template
$(CP) $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R $(CP) -a $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R
$(CP) -a $(PKG_BUILD_DIR)/$(2)/ipkg/* $(1)/CONTROL/ 2>/dev/null || true
endef endef
@ -163,7 +164,6 @@ endef
define Package/luci-ff-halle/install define Package/luci-ff-halle/install
$(call Package/luci/install/template,$(1),applications/community-halle) $(call Package/luci/install/template,$(1),applications/community-halle)
$(CP) -a ./ipkg/luci-ff-halle.postinst $(1)/CONTROL/postinst
endef endef
@ -181,7 +181,6 @@ endef
define Package/luci-ff-leipzig/install define Package/luci-ff-leipzig/install
$(call Package/luci/install/template,$(1),applications/community-leipzig) $(call Package/luci/install/template,$(1),applications/community-leipzig)
$(CP) -a ./ipkg/luci-ff-leipzig.postinst $(1)/CONTROL/postinst
endef endef
@ -199,7 +198,6 @@ endef
define Package/luci-ff-hannover/install define Package/luci-ff-hannover/install
$(call Package/luci/install/template,$(1),applications/community-hannover) $(call Package/luci/install/template,$(1),applications/community-hannover)
$(CP) -a ./ipkg/luci-ff-hannover.postinst $(1)/CONTROL/postinst
endef endef
@ -257,7 +255,6 @@ endef
define Package/luci-app-firewall/install define Package/luci-app-firewall/install
$(call Package/luci/install/template,$(1),applications/luci-fw) $(call Package/luci/install/template,$(1),applications/luci-fw)
$(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-fw/dist/etc/init.d/luci_fw $(1)/etc/init.d
endef endef
@ -315,9 +312,6 @@ endef
define Package/luci-app-statistics/install define Package/luci-app-statistics/install
$(call Package/luci/install/template,$(1),applications/luci-statistics) $(call Package/luci/install/template,$(1),applications/luci-statistics)
$(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-statistics/dist/usr/bin/stat-genconfig $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-statistics/dist/etc/init.d/luci_statistics $(1)/etc/init.d
$(CP) -a ./ipkg/luci-statistics.postinst $(1)/CONTROL/postinst
endef endef
@ -331,7 +325,6 @@ endef
define Package/luci-sgi-haserl/install define Package/luci-sgi-haserl/install
$(call Package/luci/install/template,$(1),libs/sgi-haserl) $(call Package/luci/install/template,$(1),libs/sgi-haserl)
$(CP) -a ./ipkg/luci-sgi-haserl.postinst $(1)/CONTROL/postinst
endef endef