diff options
| -rw-r--r-- | package/bridge/Makefile | 6 | ||||
| -rw-r--r-- | package/dnsmasq/Makefile | 10 | ||||
| -rw-r--r-- | package/dropbear/Makefile | 22 | ||||
| -rw-r--r-- | package/ebtables/Makefile | 4 | ||||
| -rw-r--r-- | package/haserl/Makefile | 4 | ||||
| -rw-r--r-- | package/iproute2/Makefile | 8 | ||||
| -rw-r--r-- | package/ipsec-tools/Makefile | 20 | ||||
| -rw-r--r-- | package/ipset/Makefile | 4 | ||||
| -rw-r--r-- | package/mtd/Makefile | 4 | ||||
| -rw-r--r-- | package/nvram/Makefile | 9 | ||||
| -rw-r--r-- | package/pcmcia-cs/Makefile | 10 | ||||
| -rw-r--r-- | package/pptp/Makefile | 12 | ||||
| -rw-r--r-- | package/robocfg/Makefile | 8 | ||||
| -rw-r--r-- | package/udev/Makefile | 28 | ||||
| -rw-r--r-- | package/wificonf/Makefile | 4 | ||||
| -rw-r--r-- | package/wireless-tools/Makefile | 8 | ||||
| -rw-r--r-- | package/zlib/Makefile | 4 |
17 files changed, 82 insertions, 83 deletions
diff --git a/package/bridge/Makefile b/package/bridge/Makefile index 44856c9f16..65fd8358e8 100644 --- a/package/bridge/Makefile +++ b/package/bridge/Makefile @@ -29,9 +29,9 @@ define Build/Configure $(call Build/Configure/Default,--with-linux-headers=$(LINUX_DIR)) endef -define Package/busybox/install - install -m0755 -d $(IDIR_DNSMASQ)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/brctl/brctl $(IDIR_BRIDGE)/usr/sbin/ +define Package/bridge/install + install -m0755 -d $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/sbin/ endef $(eval $(call BuildPackage,bridge)) diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 76b1ac0d99..d3ce64736b 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -25,11 +25,11 @@ URL:=http://www.thekelleys.org.uk/dnsmasq/ endef define Package/dnsmasq/install - install -m0755 -d $(IDIR_DNSMASQ)/usr/sbin - install -m0755 -d $(IDIR_DNSMASQ)/etc/init.d/ - install -m0755 $(PKG_BUILD_DIR)/src/dnsmasq $(IDIR_DNSMASQ)/usr/sbin/ - install -m0644 ./files/dnsmasq.conf $(IDIR_DNSMASQ)/etc/dnsmasq.conf - install -m0755 ./files/dnsmasq.init $(IDIR_DNSMASQ)/etc/init.d/S50dnsmasq + install -m0755 -d $(1)/usr/sbin + install -m0755 -d $(1)/etc/init.d/ + install -m0755 $(PKG_BUILD_DIR)/src/dnsmasq $(1)/usr/sbin/ + install -m0644 ./files/dnsmasq.conf $(1)/etc/dnsmasq.conf + install -m0755 ./files/dnsmasq.init $(1)/etc/init.d/S50dnsmasq endef $(eval $(call BuildPackage,dnsmasq)) diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index ea452f2f62..133e67a9fa 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -87,22 +87,22 @@ define Buid/Compile endef define Package/dropbear/install - mkdir -p $(IDIR_DROPBEAR)/usr/bin - mkdir -p $(IDIR_DROPBEAR)/usr/sbin + mkdir -p $(1)/usr/bin + mkdir -p $(1)/usr/sbin install -m 755 $(PKG_BUILD_DIR)/dropbearmulti \ - $(IDIR_DROPBEAR)/usr/sbin/dropbear - ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/scp - ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/ssh - ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dbclient - ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dropbearkey - mkdir -p $(IDIR_DROPBEAR)/etc/init.d - install -m 755 ./files/S50dropbear $(IDIR_DROPBEAR)/etc/init.d/ + $(1)/usr/sbin/dropbear + ln -sf ../sbin/dropbear $(1)/usr/bin/scp + ln -sf ../sbin/dropbear $(1)/usr/bin/ssh + ln -sf ../sbin/dropbear $(1)/usr/bin/dbclient + ln -sf ../sbin/dropbear $(1)/usr/bin/dropbearkey + mkdir -p $(1)/etc/init.d + install -m 755 ./files/S50dropbear $(1)/etc/init.d/ endef define Package/dropbearconvert/install - mkdir -p $(IDIR_DBCONVERT)/usr/bin + mkdir -p $(1)/usr/bin install -m 755 $(PKG_BUILD_DIR)/dropbearconvert \ - $(IDIR_DBCONVERT)/usr/bin/dropbearconvert + $(1)/usr/bin/dropbearconvert endef $(eval $(call BuildPackage,dropbear)) diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile index 4ee6833882..df551154e2 100644 --- a/package/ebtables/Makefile +++ b/package/ebtables/Makefile @@ -24,8 +24,8 @@ URL:=http://ebtables.sourceforge.net/ endef define Package/ebtables/install - install -d -m0755 $(IDIR_DNSMASQ)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/ebtables $(IDIR_EBTABLES)/usr/sbin/ebtables + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/ebtables $(1)/usr/sbin/ebtables endef $(eval $(call BuildPackage,ebtables)) diff --git a/package/haserl/Makefile b/package/haserl/Makefile index 8f35fbf623..2bb9fc9319 100644 --- a/package/haserl/Makefile +++ b/package/haserl/Makefile @@ -23,8 +23,8 @@ URL:=http://haserl.sourceforge.net/ endef define Package/haserl/install - install -m0755 -d $(IDIR_HASERL)/usr/bin - install -m0755 $(PKG_INSTALL_DIR)/usr/bin/haserl $(IDIR_HASERL)/usr/bin/ + install -m0755 -d $(1)/usr/bin + install -m0755 $(PKG_INSTALL_DIR)/usr/bin/haserl $(1)/usr/bin/ endef $(eval $(call BuildPackage,haserl)) diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 0fe03bc825..c670ee5dac 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -54,13 +54,13 @@ define Build/Compile endef define Package/ip/install - install -d -m0755 $(IDIR_IP)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/ip/ip $(IDIR_IP)/usr/sbin/ + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/ip/ip $(1)/usr/sbin/ endef define Package/tc/install - install -d -m0755 $(IDIR_TC)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/tc/tc $(IDIR_TC)/usr/sbin/ + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/tc/tc $(1)/usr/sbin/ endef # $(eval $(call BuildPackage,iproute2)) diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index 6d27397c0f..9e14b40075 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -67,16 +67,16 @@ define Build/Configure endef define Package/ipsec-tools/install - install -d -m0755 $(IDIR_IPSEC_TOOLS)/etc - install -d -m0755 $(IDIR_IPSEC_TOOLS)/usr/lib/ - install -d -m0755 $(IDIR_IPSEC_TOOLS)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(IDIR_IPSEC_TOOLS)/etc/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(IDIR_IPSEC_TOOLS)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(IDIR_IPSEC_TOOLS)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/plainrsa-gen $(IDIR_IPSEC_TOOLS)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoon $(IDIR_IPSEC_TOOLS)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoonctl $(IDIR_IPSEC_TOOLS)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/setkey $(IDIR_IPSEC_TOOLS)/usr/sbin/ + install -d -m0755 $(1)/etc + install -d -m0755 $(1)/usr/lib/ + install -d -m0755 $(1)/usr/sbin + $(CP) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(1)/etc/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/plainrsa-gen $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoon $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoonctl $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/setkey $(1)/usr/sbin/ endef $(eval $(call BuildPackage,ipsec-tools)) diff --git a/package/ipset/Makefile b/package/ipset/Makefile index c938819799..3b65a7d37d 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -26,8 +26,8 @@ endef define Package/ipset/install $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR=$(IDIR_IPSET) PREFIX=/usr install - rm -rf $(IDIR_IPSET)/usr/man + DESTDIR=$(1) PREFIX=/usr install + rm -rf $(1)/usr/man endef $(eval $(call BuildPackage,ipset)) diff --git a/package/mtd/Makefile b/package/mtd/Makefile index 381184b1d3..0d684b8f49 100644 --- a/package/mtd/Makefile +++ b/package/mtd/Makefile @@ -23,6 +23,6 @@ define Build/Compile endef define Package/mtd/install - install -d -m0755 $(IDIR_MTD)/sbin - install -m0755 $(PKG_BUILD_DIR)/mtd $(IDIR_MTD)/sbin + install -d -m0755 $(1)/sbin + install -m0755 $(PKG_BUILD_DIR)/mtd $(1)/sbin endef diff --git a/package/nvram/Makefile b/package/nvram/Makefile index 762eb58183..3b9f82dbe0 100644 --- a/package/nvram/Makefile +++ b/package/nvram/Makefile @@ -22,12 +22,11 @@ define Build/Prepare $(CP) ./src/* $(PKG_BUILD_DIR) endef -$(IPKG_NVRAM): define Package/nvram/install - install -d -m0755 $(IDIR_NVRAM)/usr/lib - install -d -m0755 $(IDIR_NVRAM)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/*.so $(IDIR_NVRAM)/usr/lib - install -m0755 $(PKG_BUILD_DIR)/nvram $(IDIR_NVRAM)/usr/sbin + install -d -m0755 $(1)/usr/lib + install -d -m0755 $(1)/usr/sbin + $(CP) $(PKG_BUILD_DIR)/*.so $(1)/usr/lib + install -m0755 $(PKG_BUILD_DIR)/nvram $(1)/usr/sbin endef compile-targets: install-dev diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile index a9c7ba8001..c89ce2913f 100644 --- a/package/pcmcia-cs/Makefile +++ b/package/pcmcia-cs/Makefile @@ -43,11 +43,11 @@ define Build/Configure endef define Package/pcmcia-cs/install - install -m0755 -d $(IDIR_PCMCIA_UTILS)/etc - install -m0755 -d $(IDIR_PCMCIA_UTILS)/usr/sbin - install -m0644 $(PKG_INSTALL_DIR)/etc/pcmcia $(IDIR_PCMCIA_UTILS)/etc/ - install -m0755 $(PKG_INSTALL_DIR)/sbin/cardctl $(IDIR_PCMCIA_UTILS)/usr/sbin/ - install -m0755 $(PKG_INSTALL_DIR)/sbin/cardmgr $(IDIR_PCMCIA_UTILS)/usr/sbin/ + install -m0755 -d $(1)/etc + install -m0755 -d $(1)/usr/sbin + install -m0644 $(PKG_INSTALL_DIR)/etc/pcmcia $(1)/etc/ + install -m0755 $(PKG_INSTALL_DIR)/sbin/cardctl $(1)/usr/sbin/ + install -m0755 $(PKG_INSTALL_DIR)/sbin/cardmgr $(1)/usr/sbin/ endef $(eval $(call BuildPackage,pcmcia-cs)) diff --git a/package/pptp/Makefile b/package/pptp/Makefile index de7c50c2d4..776a668640 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -23,12 +23,12 @@ URL:=http://pptpclient.sourceforge.net/ endef define Package/pptp/install - install -d -m0755 $(IDIR_PPTP)/sbin - install -d -m0755 $(IDIR_PPTP)/etc/ppp - install -d -m0755 $(IDIR_PPTP)/usr/sbin - install -m0755 ./files/ifup.pptp $(IDIR_PPTP)/sbin/ifup.pptp - install -m0644 ./files/options.pptp $(IDIR_PPTP)/etc/ppp/ - install -m0755 $(PKG_BUILD_DIR)/pptp $(IDIR_PPTP)/usr/sbin/ + install -d -m0755 $(1)/sbin + install -d -m0755 $(1)/etc/ppp + install -d -m0755 $(1)/usr/sbin + install -m0755 ./files/ifup.pptp $(1)/sbin/ifup.pptp + install -m0644 ./files/options.pptp $(1)/etc/ppp/ + install -m0755 $(PKG_BUILD_DIR)/pptp $(1)/usr/sbin/ endef $(eval $(call BuildPackage,pptp)) diff --git a/package/robocfg/Makefile b/package/robocfg/Makefile index 194c022a41..8f89e75387 100644 --- a/package/robocfg/Makefile +++ b/package/robocfg/Makefile @@ -23,10 +23,10 @@ define Build/Compile endef define Package/robocfg/install - install -d -m0755 $(IDIR_ROBOCFG)/sbin - install -m0755 $(PKG_BUILD_DIR)/robocfg $(IDIR_ROBOCFG)/sbin/ - $(RSTRIP) $(IDIR_ROBOCFG) - $(IPKG_BUILD) $(IDIR_ROBOCFG) $(PACKAGE_DIR) + install -d -m0755 $(1)/sbin + install -m0755 $(PKG_BUILD_DIR)/robocfg $(1)/sbin/ + $(RSTRIP) $(1) + $(IPKG_BUILD) $(1) $(PACKAGE_DIR) endef $(eval $(call BuildPackage,robocfg)) diff --git a/package/udev/Makefile b/package/udev/Makefile index 9b7c9171ae..620aa1aedd 100644 --- a/package/udev/Makefile +++ b/package/udev/Makefile @@ -31,20 +31,20 @@ URL:=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html endef define Package/udev/install - install -d -m0775 $(IDIR_UDEV)/etc/udev - install -d -m0775 $(IDIR_UDEV)/lib/udev - install -d -m0775 $(IDIR_UDEV)/sbin/ - install -d -m0775 $(IDIR_UDEV)/usr/bin/ - install -d -m0775 $(IDIR_UDEV)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/etc/udev/* $(IDIR_UDEV)/etc/udev/ - $(CP) $(PKG_INSTALL_DIR)/sbin/udev $(IDIR_UDEV)/sbin/ - $(CP) $(PKG_INSTALL_DIR)/sbin/udevcontrol $(IDIR_UDEV)/sbin/ - $(CP) $(PKG_INSTALL_DIR)/sbin/udevd $(IDIR_UDEV)/sbin/ - $(CP) $(PKG_INSTALL_DIR)/sbin/udevsend $(IDIR_UDEV)/sbin/ - $(CP) $(PKG_INSTALL_DIR)/sbin/udevstart $(IDIR_UDEV)/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(IDIR_UDEV)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevtest $(IDIR_UDEV)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(IDIR_UDEV)/usr/sbin/ + install -d -m0775 $(1)/etc/udev + install -d -m0775 $(1)/lib/udev + install -d -m0775 $(1)/sbin/ + install -d -m0775 $(1)/usr/bin/ + install -d -m0775 $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/etc/udev/* $(1)/etc/udev/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udev $(1)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udevcontrol $(1)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udevd $(1)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udevsend $(1)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udevstart $(1)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevtest $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(1)/usr/sbin/ endef $(eval $(call BuildPackage,udev)) diff --git a/package/wificonf/Makefile b/package/wificonf/Makefile index 5e5c667af4..5fbaf05231 100644 --- a/package/wificonf/Makefile +++ b/package/wificonf/Makefile @@ -22,6 +22,6 @@ define Build/Compile endef define Package/wificonf/install - install -d -m0755 $(IDIR_WIFICONF)/sbin - install -m0755 $(PKG_BUILD_DIR)/wifi $(IDIR_WIFICONF)/sbin/ + install -d -m0755 $(1)/sbin + install -m0755 $(PKG_BUILD_DIR)/wifi $(1)/sbin/ endef diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile index f981f7b5b6..39a4ee6b66 100644 --- a/package/wireless-tools/Makefile +++ b/package/wireless-tools/Makefile @@ -36,10 +36,10 @@ define Build/Compile endef define Package/wireless-tools/install - install -d -m0755 $(IDIR_WIRELESS_TOOLS)/usr/lib - install -d -m0755 $(IDIR_WIRELESS_TOOLS)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/ - install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(IDIR_WIRELESS_TOOLS)/usr/sbin/ + install -d -m0755 $(1)/usr/lib + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/libiw.so.28 $(1)/usr/lib/ + install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(1)/usr/sbin/ endef install-dev: $(PKG_BUILD_DIR)/.built diff --git a/package/zlib/Makefile b/package/zlib/Makefile index d3c8714bac..56c0381f56 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -49,8 +49,8 @@ define Build/Compile endef define Package/zlib/install - install -m0755 -d $(IDIR_ZLIB)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/ + install -m0755 -d $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/ endef $(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built |