From f279d17ac0e7d1b0a0e671c3d831f39b68369482 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 23 Nov 2006 00:29:07 +0000 Subject: [PATCH] replace lots of manual install commands with INSTALL_* variables SVN-Revision: 5624 --- admin/monit/Makefile | 20 ++--- admin/osiris/Makefile | 6 +- admin/syslog-ng/Makefile | 10 +-- ipv6/6tunnel/Makefile | 2 +- ipv6/aiccu/Makefile | 10 +-- ipv6/dhcp6/Makefile | 12 +-- ipv6/mrd6/Makefile | 6 +- ipv6/ndisc/Makefile | 12 +-- lang/jamvm/Makefile | 8 +- lang/lua/Makefile | 10 +-- lang/perl/Makefile | 4 +- lang/php4/Makefile | 18 ++--- lang/php5/Makefile | 18 ++--- lang/python/Makefile | 4 +- lang/sablevm-classpath/Makefile | 10 +-- lang/sablevm/Makefile | 4 +- libs/alsa-lib/Makefile | 2 +- libs/avahi/Makefile | 26 +++---- libs/axtls/Makefile | 8 +- libs/bluez-libs/Makefile | 2 +- libs/cgilib/Makefile | 2 +- libs/curl/Makefile | 4 +- libs/cyrus-sasl/Makefile | 4 +- libs/db/Makefile | 2 +- libs/expat/Makefile | 2 +- libs/flac/Makefile | 2 +- libs/freetype/Makefile | 2 +- libs/gd/Makefile | 2 +- libs/glib/Makefile | 2 +- libs/gnutls/Makefile | 6 +- libs/gsm/Makefile | 4 +- libs/howl/Makefile | 26 +++---- libs/id3lib/Makefile | 2 +- libs/libamsel/Makefile | 2 +- libs/libao/Makefile | 2 +- libs/libart/Makefile | 2 +- libs/libaudiofile/Makefile | 2 +- libs/libcli/Makefile | 2 +- libs/libdaemon/Makefile | 2 +- libs/libdnet/Makefile | 4 +- libs/libelf/Makefile | 2 +- libs/libevent/Makefile | 2 +- libs/libexif/Makefile | 2 +- libs/libffi-sable/Makefile | 2 +- libs/libgcrypt/Makefile | 2 +- libs/libgdbm/Makefile | 2 +- libs/libgpg-error/Makefile | 2 +- libs/libgphoto2/Makefile | 4 +- libs/libiconv/Makefile | 2 +- libs/libid3tag/Makefile | 2 +- libs/libjpeg/Makefile | 4 +- libs/libmad/Makefile | 2 +- libs/libmcrypt/Makefile | 2 +- libs/libnet-1.0.x/Makefile | 2 +- libs/libnet-1.1.x/Makefile | 2 +- libs/libnids/Makefile | 2 +- libs/libol/Makefile | 2 +- libs/libosip2/Makefile | 2 +- libs/libpng/Makefile | 2 +- libs/librsync/Makefile | 2 +- libs/libtasn1/Makefile | 2 +- libs/libtool/Makefile | 2 +- libs/libupnp/Makefile | 2 +- libs/libusb/Makefile | 2 +- libs/libvorbisidec/Makefile | 2 +- libs/libxml2/Makefile | 2 +- libs/libxslt/Makefile | 2 +- libs/lzo/Makefile | 2 +- libs/matrixssl/Makefile | 2 +- libs/mysql/Makefile | 2 +- libs/ncurses/Makefile | 6 +- libs/net-snmp/Makefile | 36 ++++----- libs/opencdk/Makefile | 2 +- libs/openldap/Makefile | 8 +- libs/pcre/Makefile | 2 +- libs/popt/Makefile | 2 +- libs/postgresql/Makefile | 4 +- libs/radiusclient-ng/Makefile | 6 +- libs/readline/Makefile | 2 +- libs/rrdtool-1.0.x/Makefile | 6 +- libs/serdisplib/Makefile | 2 +- libs/speex/Makefile | 2 +- libs/sqlite2/Makefile | 4 +- libs/sqlite3/Makefile | 4 +- libs/uclibc++/Makefile | 2 +- libs/ustl/Makefile | 2 +- multimedia/gphoto2/Makefile | 2 +- multimedia/motion/Makefile | 4 +- multimedia/palantir/Makefile | 8 +- multimedia/peercast/Makefile | 12 +-- net/aircrack-ng/Makefile | 4 +- net/amwall/Makefile | 6 +- net/aodv-uu/Makefile | 8 +- net/arpd/Makefile | 4 +- net/arpwatch/Makefile | 4 +- net/asterisk/Makefile | 128 +++++++++++++++---------------- net/atftp/Makefile | 8 +- net/autossh/Makefile | 4 +- net/bind/Makefile | 22 +++--- net/bing/Makefile | 2 +- net/bitchx/Makefile | 16 ++-- net/bitlbee/Makefile | 4 +- net/bmon/Makefile | 4 +- net/bwm/Makefile | 2 +- net/cbtt/Makefile | 8 +- net/chillispot/Makefile | 10 +-- net/click/Makefile | 6 +- net/ctorrent/Makefile | 2 +- net/cups/Makefile | 16 ++-- net/cutter/Makefile | 6 +- net/dhcp-forwarder/Makefile | 10 +-- net/dhcp/Makefile | 4 +- net/dsl-qos-queue/Makefile | 8 +- net/dsniff/Makefile | 4 +- net/ethtool/Makefile | 2 +- net/ettercap/Makefile | 8 +- net/ez-ipupdate/Makefile | 10 +-- net/fping/Makefile | 2 +- net/fprobe/Makefile | 2 +- net/freeradius/Makefile | 20 ++--- net/frickin/Makefile | 12 +-- net/gmediaserver/Makefile | 10 +-- net/gpsd/Makefile | 8 +- net/htpdate/Makefile | 12 +-- net/httping/Makefile | 4 +- net/icecast/Makefile | 6 +- net/iftop/Makefile | 2 +- net/igmpproxy/Makefile | 8 +- net/ipcad/Makefile | 4 +- net/iperf/Makefile | 2 +- net/ipkungfu/Makefile | 4 +- net/iptables-snmp/Makefile | 2 +- net/iptraf/Makefile | 8 +- net/irssi/Makefile | 4 +- net/kismet/Makefile | 38 ++++----- net/knock/Makefile | 6 +- net/l2tpd/Makefile | 16 ++-- net/l2tpns/Makefile | 6 +- net/lft/Makefile | 4 +- net/lighttpd/Makefile | 18 ++--- net/maradns/Makefile | 12 +-- net/matrixtunnel/Makefile | 2 +- net/miau/Makefile | 14 ++-- net/miax/Makefile | 4 +- net/mini_httpd/Makefile | 52 ++++++------- net/mini_sendmail/Makefile | 4 +- net/miredo/Makefile | 16 ++-- net/mtr/Makefile | 2 +- net/netperf/Makefile | 10 +-- net/netstat-nat/Makefile | 2 +- net/nfs-kernel-server/Makefile | 22 +++--- net/nfs-server/Makefile | 12 +-- net/nmap/Makefile | 4 +- net/nocatsplash/Makefile | 2 +- net/nsca/Makefile | 6 +- net/ntpclient/Makefile | 12 +-- net/oidentd/Makefile | 4 +- net/olsrd/Makefile | 38 ++++----- net/openntpd/Makefile | 16 ++-- net/openser/Makefile | 2 +- net/openssh/Makefile | 22 +++--- net/openvpn/Makefile | 6 +- net/p910nd/Makefile | 12 +-- net/parprouted/Makefile | 12 +-- net/peerguardian/Makefile | 16 ++-- net/pmacct/Makefile | 18 ++--- net/portmap/Makefile | 8 +- net/portsentry/Makefile | 8 +- net/pptpd/Makefile | 16 ++-- net/privoxy/Makefile | 2 +- net/psybnc/Makefile | 12 +-- net/ptunnel/Makefile | 2 +- net/quagga/Makefile | 32 ++++---- net/raddump/Makefile | 2 +- net/radvd/Makefile | 14 ++-- net/rarpd/Makefile | 6 +- net/reaim/Makefile | 6 +- net/rp-l2tp/Makefile | 16 ++-- net/rp-pppoe/Makefile | 36 ++++----- net/rrs/Makefile | 8 +- net/samba/Makefile | 32 ++++---- net/scanlogd/Makefile | 8 +- net/scdp/Makefile | 2 +- net/ser2net/Makefile | 4 +- net/shat/Makefile | 6 +- net/sipp/Makefile | 4 +- net/siproxd/Makefile | 10 +-- net/sipsak/Makefile | 2 +- net/slurm/Makefile | 2 +- net/snort-wireless/Makefile | 28 +++---- net/snort/Makefile | 28 +++---- net/socat/Makefile | 2 +- net/squid/Makefile | 8 +- net/srelay/Makefile | 12 +-- net/ssltunnel/Makefile | 12 +-- net/ssmtp/Makefile | 10 +-- net/stunnel/Makefile | 4 +- net/tcp_wrappers/Makefile | 2 +- net/tcpdump/Makefile | 2 +- net/tftp-hpa/Makefile | 12 +-- net/tinc/Makefile | 2 +- net/tinyproxy/Makefile | 8 +- net/tmsnc/Makefile | 2 +- net/tor/Makefile | 10 +-- net/ttcp/Makefile | 4 +- net/udp-broadcast-relay/Makefile | 2 +- net/ulogd/Makefile | 16 ++-- net/uob-nomad/Makefile | 2 +- net/updatedd/Makefile | 12 +-- net/vgp/Makefile | 2 +- net/vnc-reflector/Makefile | 4 +- net/vncrepeater/Makefile | 6 +- net/vnstat/Makefile | 4 +- net/vpnc/Makefile | 4 +- net/vrrpd/Makefile | 12 +-- net/vsftpd/Makefile | 10 +-- net/vtun/Makefile | 6 +- net/wccpd/Makefile | 2 +- net/wdiag/Makefile | 2 +- net/weechat/Makefile | 4 +- net/wifidog/Makefile | 14 ++-- net/wknock/Makefile | 6 +- net/wput/Makefile | 4 +- net/wrt-radauth/Makefile | 6 +- net/xinetd/Makefile | 12 +-- net/xsupplicant/Makefile | 8 +- net/yafc/Makefile | 2 +- sound/madplay/Makefile | 2 +- sound/mpd/Makefile | 4 +- sound/mt-daapd/Makefile | 14 ++-- sound/sox/Makefile | 2 +- utils/alsa-utils/Makefile | 2 +- utils/bc/Makefile | 8 +- utils/bluez-utils/Makefile | 6 +- utils/cifsmount/Makefile | 4 +- utils/collectd/Makefile | 8 +- utils/deco/Makefile | 10 +-- utils/dosfstools/Makefile | 2 +- utils/dtach/Makefile | 4 +- utils/e2fsprogs/Makefile | 4 +- utils/fetchmail/Makefile | 2 +- utils/gnupg/Makefile | 4 +- utils/hdparm/Makefile | 4 +- utils/heyu/Makefile | 8 +- utils/lcd4linux/Makefile | 4 +- utils/lilo/Makefile | 4 +- utils/logrotate/Makefile | 6 +- utils/lrzsz/Makefile | 2 +- utils/macchanger/Makefile | 4 +- utils/mgetty/Makefile | 12 +-- utils/microcom/Makefile | 4 +- utils/minicom/Makefile | 4 +- utils/mutt/Makefile | 2 +- utils/nano/Makefile | 2 +- utils/pciutils/Makefile | 4 +- utils/picocom/Makefile | 4 +- utils/pipacs/Makefile | 4 +- utils/procmail/Makefile | 2 +- utils/rrdcollect/Makefile | 18 ++--- utils/rrdtool/Makefile | 8 +- utils/rsync/Makefile | 2 +- utils/sane-backends/Makefile | 8 +- utils/screen/Makefile | 4 +- utils/setpwc/Makefile | 4 +- utils/setserial/Makefile | 8 +- utils/strace/Makefile | 4 +- utils/usbutils/Makefile | 4 +- utils/vim/Makefile | 4 +- utils/wx200d/Makefile | 4 +- 269 files changed, 1008 insertions(+), 1008 deletions(-) diff --git a/admin/monit/Makefile b/admin/monit/Makefile index e9b499de8..82a25be1e 100644 --- a/admin/monit/Makefile +++ b/admin/monit/Makefile @@ -65,21 +65,21 @@ define Build/Compile endef define Package/monit/install - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc install -m0600 $(PKG_BUILD_DIR)/monitrc $(1)/etc/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/monit.init $(1)/etc/init.d/monit - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/monit-ssl $(1)/usr/sbin/monit + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/monit.init $(1)/etc/init.d/monit + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/monit-ssl $(1)/usr/sbin/monit endef define Package/monit-nossl/install - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc install -m0600 $(PKG_BUILD_DIR)/monitrc $(1)/etc/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/monit.init $(1)/etc/init.d/monit - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/monit-nossl $(1)/usr/sbin/monit + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/monit.init $(1)/etc/init.d/monit + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/monit-nossl $(1)/usr/sbin/monit endef $(eval $(call BuildPackage,monit)) diff --git a/admin/osiris/Makefile b/admin/osiris/Makefile index 6e8a212ad..98fab57bb 100644 --- a/admin/osiris/Makefile +++ b/admin/osiris/Makefile @@ -48,10 +48,10 @@ define Build/Compile endef define Package/osirisd/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/osirisd $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/osirisd.init $(1)/etc/init.d/osirisd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/osirisd.init $(1)/etc/init.d/osirisd endef $(eval $(call BuildPackage,osirisd)) diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile index 723c3de58..9daeede7d 100644 --- a/admin/syslog-ng/Makefile +++ b/admin/syslog-ng/Makefile @@ -52,12 +52,12 @@ $(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" \ endef define Package/syslog-ng/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/syslog-ng $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/syslog-ng.init $(1)/etc/init.d/syslog-ng - install -d -m0755 $(1)/etc/syslog-ng - install -m0644 ./files/syslog-ng.conf $(1)/etc/syslog-ng/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/syslog-ng.init $(1)/etc/init.d/syslog-ng + $(INSTALL_DIR) $(1)/etc/syslog-ng + $(INSTALL_DATA) ./files/syslog-ng.conf $(1)/etc/syslog-ng/ endef $(eval $(call BuildPackage,syslog-ng)) diff --git a/ipv6/6tunnel/Makefile b/ipv6/6tunnel/Makefile index 59e63594b..d8b92e01c 100644 --- a/ipv6/6tunnel/Makefile +++ b/ipv6/6tunnel/Makefile @@ -43,7 +43,7 @@ define Build/Compile endef define Package/6tunnel/install - install -m0755 -d $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ endef diff --git a/ipv6/aiccu/Makefile b/ipv6/aiccu/Makefile index 9f51164be..477d5f916 100644 --- a/ipv6/aiccu/Makefile +++ b/ipv6/aiccu/Makefile @@ -38,12 +38,12 @@ define Build/Compile endef define Package/aiccu/install - install -d -m0755 $(1)/usr/sbin - install -m 755 $(PKG_BUILD_DIR)/unix-console/$(PKG_NAME) $(1)/usr/sbin/ - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/unix-console/$(PKG_NAME) $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc install -m 644 $(PKG_BUILD_DIR)/doc/aiccu.conf $(1)/etc/ - install -d -m0755 $(1)/etc/init.d - install -m 755 ./files/aiccu.init $(1)/etc/init.d/aiccu + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/aiccu.init $(1)/etc/init.d/aiccu endef $(eval $(call BuildPackage,aiccu)) diff --git a/ipv6/dhcp6/Makefile b/ipv6/dhcp6/Makefile index fc09e761a..fdf9c9801 100644 --- a/ipv6/dhcp6/Makefile +++ b/ipv6/dhcp6/Makefile @@ -67,15 +67,15 @@ define Build/Compile endef define Package/dhcp6-client/install - install -d $(1)/usr/sbin $(1)/etc/dhcp6 - install -m0755 $(PKG_BUILD_DIR)/client/cli $(1)/usr/sbin/dhcp6client - install -m0755 $(PKG_BUILD_DIR)/client/solicit.conf $(1)/etc/dhcp6/ + $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/dhcp6 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/client/cli $(1)/usr/sbin/dhcp6client + $(INSTALL_BIN) $(PKG_BUILD_DIR)/client/solicit.conf $(1)/etc/dhcp6/ endef define Package/dhcp6-server/install - install -d -m0755 $(1)/usr/sbin $(1)/etc/dhcpd6 - install -m0755 $(PKG_BUILD_DIR)/server/serv $(1)/usr/sbin/dhcpd6 - install -m0755 $(PKG_BUILD_DIR)/server/*.conf $(1)/etc/dhcpd6/ + $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/dhcpd6 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/server/serv $(1)/usr/sbin/dhcpd6 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/server/*.conf $(1)/etc/dhcpd6/ endef $(eval $(call BuildPackage,dhcp6-client)) diff --git a/ipv6/mrd6/Makefile b/ipv6/mrd6/Makefile index 49f72234a..0ce7ca312 100644 --- a/ipv6/mrd6/Makefile +++ b/ipv6/mrd6/Makefile @@ -58,9 +58,9 @@ define Build/Compile endef define Package/mrd6/install - install -d -m0755 $(1)/etc/init.d - install -m0644 files/mrd6.conf $(1)/etc - install -m0755 files/mrd6.init $(1)/etc/init.d/mrd6 + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_DATA) files/mrd6.conf $(1)/etc + $(INSTALL_BIN) files/mrd6.init $(1)/etc/init.d/mrd6 endef $(eval $(call BuildPackage,mrd6)) diff --git a/ipv6/ndisc/Makefile b/ipv6/ndisc/Makefile index ff2379f56..1db595d54 100644 --- a/ipv6/ndisc/Makefile +++ b/ipv6/ndisc/Makefile @@ -57,18 +57,18 @@ define Build/Compile endef define Package/ndisc6/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/ndisc6 $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ndisc6 $(1)/usr/bin/ endef define Package/rdisc6/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/rdisc6 $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/rdisc6 $(1)/usr/bin/ endef define Package/tcptraceroute6/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/tcptraceroute6 $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/tcptraceroute6 $(1)/usr/bin/ endef $(eval $(call BuildPackage,ndisc6)) diff --git a/lang/jamvm/Makefile b/lang/jamvm/Makefile index 2992143ac..4dbd921ae 100644 --- a/lang/jamvm/Makefile +++ b/lang/jamvm/Makefile @@ -49,10 +49,10 @@ define Build/Compile endef define Package/jamvm/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/src/jamvm $(1)/usr/bin/ - install -d -m0755 $(1)/usr/share/jamvm - install -m0644 $(PKG_BUILD_DIR)/lib/classes.zip $(1)/usr/share/jamvm/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/jamvm $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/share/jamvm + $(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/classes.zip $(1)/usr/share/jamvm/ endef $(eval $(call BuildPackage,jamvm)) diff --git a/lang/lua/Makefile b/lang/lua/Makefile index bcdfa2819..151c1f0e4 100644 --- a/lang/lua/Makefile +++ b/lang/lua/Makefile @@ -120,23 +120,23 @@ define Build/UninstallDev endef define Package/liblua/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.so.* $(1)/usr/lib/ endef define Package/lua/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/lua $(1)/usr/bin/ endef define Package/luac/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/luac $(1)/usr/bin/ endef define Package/lua-examples/install - install -d -m0755 $(1)/usr/share/lua/examples - install -m0644 $(PKG_BUILD_DIR)/test/*.lua \ + $(INSTALL_DIR) $(1)/usr/share/lua/examples + $(INSTALL_DATA) $(PKG_BUILD_DIR)/test/*.lua \ $(1)/usr/share/lua/examples/ endef diff --git a/lang/perl/Makefile b/lang/perl/Makefile index ea737add5..de6083639 100644 --- a/lang/perl/Makefile +++ b/lang/perl/Makefile @@ -42,8 +42,8 @@ define Build/Compile endef define Package/microperl/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/microperl $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/microperl $(1)/usr/bin/ endef $(eval $(call BuildPackage,microperl)) diff --git a/lang/php4/Makefile b/lang/php4/Makefile index f3bdc99d7..036789f30 100644 --- a/lang/php4/Makefile +++ b/lang/php4/Makefile @@ -321,32 +321,32 @@ define Build/Compile endef define Package/php4/install - install -d -m0755 $(1)/etc - install -m0644 ./files/php.ini $(1)/etc/ + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/php.ini $(1)/etc/ endef define Package/php4-cli/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/php-cli $(1)/usr/bin/php endef define Package/php4-cgi/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/php-cgi $(1)/usr/bin/php endef define Package/php4-fastcgi/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/php-fastcgi $(1)/usr/sbin/php - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/php.init $(1)/etc/init.d/php + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/php.init $(1)/etc/init.d/php endef define BuildPlugin define Package/$(1)/install - [ -z "$(2)" ] || install -d -m0755 $$(1)/usr/lib/php + [ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/php for m in $(2); do \ - install -m0755 $(PKG_BUILD_DIR)/modules/$$$$$$$${m}.so $$(1)/usr/lib/php/ ; \ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/$$$$$$$${m}.so $$(1)/usr/lib/php/ ; \ done endef diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 1b3177c05..af9de6b1d 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -325,32 +325,32 @@ define Build/Compile endef define Package/php5/install - install -d -m0755 $(1)/etc - install -m0644 ./files/php.ini $(1)/etc/ + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/php.ini $(1)/etc/ endef define Package/php5-cli/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/php-cli $(1)/usr/bin/php endef define Package/php5-cgi/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/php-cgi $(1)/usr/bin/php endef define Package/php5-fastcgi/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/php-fastcgi $(1)/usr/sbin/php - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/php.init $(1)/etc/init.d/php + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/php.init $(1)/etc/init.d/php endef define BuildPlugin define Package/$(1)/install - [ -z "$(2)" ] || install -d -m0755 $$(1)/usr/lib/php + [ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/php for m in $(2); do \ - install -m0755 $(PKG_BUILD_DIR)/modules/$$$$$$$${m}.so $$(1)/usr/lib/php/ ; \ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/$$$$$$$${m}.so $$(1)/usr/lib/php/ ; \ done endef diff --git a/lang/python/Makefile b/lang/python/Makefile index 4088c27e1..e05c97c2d 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -93,10 +93,10 @@ define Build/UninstallDev endef define Package/python/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/python2.4 $(1)/usr/bin/ ln -sf python2.4 $(1)/usr/bin/python - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.4 $(1)/usr/lib/ rm -rf \ $(1)/usr/lib/python2.4/bsddb/test \ diff --git a/lang/sablevm-classpath/Makefile b/lang/sablevm-classpath/Makefile index c2e0cfae4..2b1f291c6 100644 --- a/lang/sablevm-classpath/Makefile +++ b/lang/sablevm-classpath/Makefile @@ -69,21 +69,21 @@ define Build/Compile endef define Package/libsablevm-classpath/install - install -d -m0755 $(1)/usr/lib/sablevm-classpath + $(INSTALL_DIR) $(1)/usr/lib/sablevm-classpath $(CP) $(PKG_INSTALL_DIR)/usr/lib/sablevm-classpath/libjava*.so $(1)/usr/lib/sablevm-classpath/ - install -d -m0755 $(1)/usr/lib/security + $(INSTALL_DIR) $(1)/usr/lib/security $(CP) $(PKG_INSTALL_DIR)/usr/lib/security/classpath.security $(1)/usr/lib/security/ endef define Package/sablevm-classpath-full/install - install -d -m0755 $(1)/usr/share/sablevm-classpath + $(INSTALL_DIR) $(1)/usr/share/sablevm-classpath $(CP) $(PKG_INSTALL_DIR)/usr/share/sablevm-classpath/{libclasspath,resources}.jar \ $(1)/usr/share/sablevm-classpath/ endef define Package/sablevm-classpath-mini/install - install -d -m0755 $(1)/usr/share/sablevm-classpath - install -m0755 $(PKG_BUILD_DIR)/lib/mini.jar \ + $(INSTALL_DIR) $(1)/usr/share/sablevm-classpath + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/mini.jar \ $(1)/usr/share/sablevm-classpath/libclasspath.jar endef diff --git a/lang/sablevm/Makefile b/lang/sablevm/Makefile index 2ac81b6f1..3b80eaf94 100644 --- a/lang/sablevm/Makefile +++ b/lang/sablevm/Makefile @@ -51,9 +51,9 @@ define Build/Compile endef define Package/sablevm/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/{java-,}sablevm $(1)/usr/bin/ - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsablevm-*.so $(1)/usr/lib/ endef diff --git a/libs/alsa-lib/Makefile b/libs/alsa-lib/Makefile index 91e20e482..f64579fbe 100644 --- a/libs/alsa-lib/Makefile +++ b/libs/alsa-lib/Makefile @@ -72,7 +72,7 @@ define Build/UninstallDev endef define Package/alsa-lib/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libasound.so.* $(1)/usr/lib/ endef diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile index ab470233f..d07168a9e 100644 --- a/libs/avahi/Makefile +++ b/libs/avahi/Makefile @@ -151,33 +151,33 @@ define Build/UninstallDev endef define Package/libavahi/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.so.* $(1)/usr/lib/ endef define Package/avahi-autoipd/install - install -d -m0755 $(1)/etc/avahi + $(INSTALL_DIR) $(1)/etc/avahi $(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-autoipd.action $(1)/etc/avahi/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/avahi-autoipd $(1)/usr/sbin/ endef define Package/avahi-daemon/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/avahi - install -m0644 ./files/avahi-daemon.conf $(1)/etc/avahi/ - install -d -m0755 $(1)/etc/avahi/services - install -m0644 ./files/service-http $(1)/etc/avahi/services/http.service - install -m0644 ./files/service-ssh $(1)/etc/avahi/services/ssh.service - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/avahi-daemon.init $(1)/etc/init.d/avahi-daemon + $(INSTALL_DIR) $(1)/etc/avahi + $(INSTALL_DATA) ./files/avahi-daemon.conf $(1)/etc/avahi/ + $(INSTALL_DIR) $(1)/etc/avahi/services + $(INSTALL_DATA) ./files/service-http $(1)/etc/avahi/services/http.service + $(INSTALL_DATA) ./files/service-ssh $(1)/etc/avahi/services/ssh.service + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/avahi-daemon.init $(1)/etc/init.d/avahi-daemon endef define Package/avahi-dnsconfd/install - install -d -m0755 $(1)/etc/avahi + $(INSTALL_DIR) $(1)/etc/avahi $(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(1)/etc/avahi/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(1)/usr/sbin/ endef diff --git a/libs/axtls/Makefile b/libs/axtls/Makefile index 20e7f1cff..591af371b 100644 --- a/libs/axtls/Makefile +++ b/libs/axtls/Makefile @@ -50,13 +50,13 @@ define Build/Compile endef define Package/libaxtls/install - install -d -m0755 $(1)/usr/lib - install -m0755 $(PKG_BUILD_DIR)/libaxtls.so $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_BUILD_DIR)/libaxtls.so $(1)/usr/lib/ endef define Package/awhttpd/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/awhttpd $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/awhttpd $(1)/usr/sbin/ endef $(eval $(call BuildPackage,libaxtls)) diff --git a/libs/bluez-libs/Makefile b/libs/bluez-libs/Makefile index 22fe8af19..b3ac9290d 100644 --- a/libs/bluez-libs/Makefile +++ b/libs/bluez-libs/Makefile @@ -56,7 +56,7 @@ define Build/UninstallDev endef define Package/bluez-libs/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.so.* $(1)/usr/lib/ endef diff --git a/libs/cgilib/Makefile b/libs/cgilib/Makefile index 25175c55c..10802ee10 100644 --- a/libs/cgilib/Makefile +++ b/libs/cgilib/Makefile @@ -53,7 +53,7 @@ define Build/UninstallDev endef define Package/cgilib/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/libcgi.so.* $(1)/usr/lib/ endef diff --git a/libs/curl/Makefile b/libs/curl/Makefile index e429276ad..55ef358af 100644 --- a/libs/curl/Makefile +++ b/libs/curl/Makefile @@ -102,12 +102,12 @@ define Build/UninstallDev endef define Package/curl/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/curl $(1)/usr/bin/ endef define Package/libcurl/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.so.* $(1)/usr/lib/ endef diff --git a/libs/cyrus-sasl/Makefile b/libs/cyrus-sasl/Makefile index 3626f2248..1b1fa3773 100644 --- a/libs/cyrus-sasl/Makefile +++ b/libs/cyrus-sasl/Makefile @@ -104,9 +104,9 @@ define Build/UninstallDev endef define Package/libsasl2/install - install -d -m0755 $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsasl2.so.* $(1)/usr/lib/ - install -d -m0755 $(1)/usr/lib/sasl2 + $(INSTALL_DIR) $(1)/usr/lib/sasl2 $(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.so.* $(1)/usr/lib/sasl2/ endef diff --git a/libs/db/Makefile b/libs/db/Makefile index 932104158..56b993358 100644 --- a/libs/db/Makefile +++ b/libs/db/Makefile @@ -82,7 +82,7 @@ define Build/Compile endef define Package/libdb/install - install -m0755 -d $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb-*.so $(1)/usr/lib/ endef diff --git a/libs/expat/Makefile b/libs/expat/Makefile index 1afdf34e3..5af8eb8f2 100644 --- a/libs/expat/Makefile +++ b/libs/expat/Makefile @@ -61,7 +61,7 @@ define Build/UninstallDev endef define Package/libexpat/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.so.* $(1)/usr/lib/ endef diff --git a/libs/flac/Makefile b/libs/flac/Makefile index 36288be8c..806e9030f 100644 --- a/libs/flac/Makefile +++ b/libs/flac/Makefile @@ -43,7 +43,7 @@ define Build/Compile endef define Package/libflac/install - install -m0755 -d $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.so $(1)/usr/lib/ endef diff --git a/libs/freetype/Makefile b/libs/freetype/Makefile index a93ae2998..4204a4bcd 100644 --- a/libs/freetype/Makefile +++ b/libs/freetype/Makefile @@ -74,7 +74,7 @@ define Build/UninstallDev endef define Package/libfreetype/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.so.* $(1)/usr/lib/ endef diff --git a/libs/gd/Makefile b/libs/gd/Makefile index 7e8d9a519..12115fa44 100644 --- a/libs/gd/Makefile +++ b/libs/gd/Makefile @@ -72,7 +72,7 @@ define Build/UninstallDev endef define Package/libgd/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgd.so.* $(1)/usr/lib/ endef diff --git a/libs/glib/Makefile b/libs/glib/Makefile index 184db0c76..e73287b66 100644 --- a/libs/glib/Makefile +++ b/libs/glib/Makefile @@ -93,7 +93,7 @@ define Build/UninstallDev endef define Package/glib1/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-1.2.so.* $(1)/usr/lib/ endef diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index 6ae891be8..024ad50b9 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -120,18 +120,18 @@ define Build/UninstallDev endef define Package/gnutls-utils/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/certtool $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} $(1)/usr/bin/ endef define Package/libgnutls/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra}.so.* $(1)/usr/lib/ endef define Package/libgnutls-openssl/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls-openssl.so.* $(1)/usr/lib/ endef diff --git a/libs/gsm/Makefile b/libs/gsm/Makefile index e1c6225f7..758dbee02 100644 --- a/libs/gsm/Makefile +++ b/libs/gsm/Makefile @@ -62,12 +62,12 @@ define Build/Compile endef define Package/libgsm/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgsm.so.* $(1)/usr/lib/ endef define Package/gsm-utils/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ endef diff --git a/libs/howl/Makefile b/libs/howl/Makefile index 33264c342..89b02bab0 100644 --- a/libs/howl/Makefile +++ b/libs/howl/Makefile @@ -112,35 +112,35 @@ define Build/UninstallDev endef define Package/libhowl/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{howl,mDNSResponder}.so.* $(1)/usr/lib/ endef define Package/howl-autoipd/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/bin/autoipd $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/init.d - install -m0644 ./files/autoipd.init $(1)/etc/init.d/autoipd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_DATA) ./files/autoipd.init $(1)/etc/init.d/autoipd endef define Package/howl-mdnsresponder/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/bin/mDNSResponder $(1)/usr/sbin/ - install -d -m0755 $(1)/etc - install -m0644 ./files/mDNSResponder.conf $(1)/etc/mDNSResponder.conf - install -d -m0755 $(1)/etc/init.d - install -m0644 ./files/mDNSResponder.init $(1)/etc/init.d/mDNSResponder + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/mDNSResponder.conf $(1)/etc/mDNSResponder.conf + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_DATA) ./files/mDNSResponder.init $(1)/etc/init.d/mDNSResponder endef define Package/howl-nifd/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/bin/nifd $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/init.d - install -m0644 ./files/nifd.init $(1)/etc/init.d/nifd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_DATA) ./files/nifd.init $(1)/etc/init.d/nifd endef define Package/howl-utils/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/mDNS{Browse,Publish,Query,Resolve} $(1)/usr/bin/ endef diff --git a/libs/id3lib/Makefile b/libs/id3lib/Makefile index 81246d4da..d62017608 100644 --- a/libs/id3lib/Makefile +++ b/libs/id3lib/Makefile @@ -67,7 +67,7 @@ define Build/UninstallDev endef define Package/id3lib/install - install -d -m0755 $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3-*.so.* $(1)/usr/lib/ endef diff --git a/libs/libamsel/Makefile b/libs/libamsel/Makefile index 6da2827f2..a9933354d 100644 --- a/libs/libamsel/Makefile +++ b/libs/libamsel/Makefile @@ -45,7 +45,7 @@ define Build/Compile endef define Package/libamsel/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib endef diff --git a/libs/libao/Makefile b/libs/libao/Makefile index 7febd75aa..5f64558b1 100644 --- a/libs/libao/Makefile +++ b/libs/libao/Makefile @@ -69,7 +69,7 @@ define Build/UninstallDev endef define Package/libao/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.so.* $(1)/usr/lib/ endef diff --git a/libs/libart/Makefile b/libs/libart/Makefile index 8f5747f9c..45d7525ba 100644 --- a/libs/libart/Makefile +++ b/libs/libart/Makefile @@ -71,7 +71,7 @@ define Build/UninstallDev endef define Package/libart/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.so.* $(1)/usr/lib/ endef diff --git a/libs/libaudiofile/Makefile b/libs/libaudiofile/Makefile index f299d6fed..7d6ea4db5 100644 --- a/libs/libaudiofile/Makefile +++ b/libs/libaudiofile/Makefile @@ -72,7 +72,7 @@ define Build/UninstallDev endef define Package/libaudiofile/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.so.* $(1)/usr/lib/ endef diff --git a/libs/libcli/Makefile b/libs/libcli/Makefile index 808bc6ffd..621771a52 100644 --- a/libs/libcli/Makefile +++ b/libs/libcli/Makefile @@ -56,7 +56,7 @@ define Build/UninstallDev endef define Package/libcli/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcli.so.* $(1)/usr/lib/ endef diff --git a/libs/libdaemon/Makefile b/libs/libdaemon/Makefile index 1a1cb9a05..a9b132395 100644 --- a/libs/libdaemon/Makefile +++ b/libs/libdaemon/Makefile @@ -75,7 +75,7 @@ define Build/UninstallDev endef define Package/libdaemon/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so.* $(1)/usr/lib/ endef diff --git a/libs/libdnet/Makefile b/libs/libdnet/Makefile index 420c110c4..501bc61cb 100644 --- a/libs/libdnet/Makefile +++ b/libs/libdnet/Makefile @@ -73,9 +73,9 @@ define Build/UninstallDev endef define Package/libdnet/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnet.so.* $(1)/usr/lib/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnet $(1)/usr/sbin/ endef diff --git a/libs/libelf/Makefile b/libs/libelf/Makefile index f4b0eed18..1c80c690d 100644 --- a/libs/libelf/Makefile +++ b/libs/libelf/Makefile @@ -63,7 +63,7 @@ define Build/UninstallDev endef define Package/libelf/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf.so.* $(1)/usr/lib/ endef diff --git a/libs/libevent/Makefile b/libs/libevent/Makefile index 27ce8c3ce..9a9663970 100644 --- a/libs/libevent/Makefile +++ b/libs/libevent/Makefile @@ -68,7 +68,7 @@ define Build/UninstallDev endef define Package/libevent/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-$(PKG_VERSION).so.* $(1)/usr/lib/ endef diff --git a/libs/libexif/Makefile b/libs/libexif/Makefile index 2ebfa14c4..560a516f0 100644 --- a/libs/libexif/Makefile +++ b/libs/libexif/Makefile @@ -59,7 +59,7 @@ define Build/UninstallDev endef define Package/libexif/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libexif*.so.* $(1)/usr/lib/ endef diff --git a/libs/libffi-sable/Makefile b/libs/libffi-sable/Makefile index 850faf47b..5e014ddc8 100644 --- a/libs/libffi-sable/Makefile +++ b/libs/libffi-sable/Makefile @@ -62,7 +62,7 @@ define Build/UninstallDev endef define Package/libffi-sable/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libffi.so.* $(1)/usr/lib/ endef diff --git a/libs/libgcrypt/Makefile b/libs/libgcrypt/Makefile index f71c33560..0ec930c82 100644 --- a/libs/libgcrypt/Makefile +++ b/libs/libgcrypt/Makefile @@ -72,7 +72,7 @@ define Build/UninstallDev endef define Package/libgcrypt/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.so.* $(1)/usr/lib/ endef diff --git a/libs/libgdbm/Makefile b/libs/libgdbm/Makefile index 5f56078b1..58a84ee1c 100644 --- a/libs/libgdbm/Makefile +++ b/libs/libgdbm/Makefile @@ -58,7 +58,7 @@ define Build/UninstallDev endef define Package/libgdbm/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.so.* $(1)/usr/lib/ endef diff --git a/libs/libgpg-error/Makefile b/libs/libgpg-error/Makefile index 85815c738..332c4817e 100644 --- a/libs/libgpg-error/Makefile +++ b/libs/libgpg-error/Makefile @@ -72,7 +72,7 @@ define Build/UninstallDev endef define Package/libgpg-error/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.so.* $(1)/usr/lib/ endef diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile index e89eda46f..4953806fe 100644 --- a/libs/libgphoto2/Makefile +++ b/libs/libgphoto2/Makefile @@ -92,12 +92,12 @@ define Build/UninstallDev endef define Package/libgphoto2/install - install -m0755 -d $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgphoto2{,_port}.so.* $(1)/usr/lib/ endef define Package/libgphoto2-drivers/install - install -d -m0755 $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgphoto2{,_port} $(1)/usr/lib/ rm -rf $(1)/usr/lib/libgphoto2{,_port}/*/*.{,l}a endef diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile index 27e62bcef..168d552de 100644 --- a/libs/libiconv/Makefile +++ b/libs/libiconv/Makefile @@ -58,7 +58,7 @@ define Build/UninstallDev endef define Package/libiconv/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.so.* $(1)/usr/lib/ endef diff --git a/libs/libid3tag/Makefile b/libs/libid3tag/Makefile index 2c268cc1c..02ae3e369 100644 --- a/libs/libid3tag/Makefile +++ b/libs/libid3tag/Makefile @@ -62,7 +62,7 @@ define Build/UninstallDev endef define Package/libid3tag/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so.* $(1)/usr/lib/ endef diff --git a/libs/libjpeg/Makefile b/libs/libjpeg/Makefile index f9fe70d21..ae8f70cda 100644 --- a/libs/libjpeg/Makefile +++ b/libs/libjpeg/Makefile @@ -86,12 +86,12 @@ define Build/UninstallDev endef define Package/libjpeg/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.so.* $(1)/usr/lib/ endef define Package/jpeg-tools/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/*jpeg* $(1)/usr/bin/ endef diff --git a/libs/libmad/Makefile b/libs/libmad/Makefile index 1affa3360..506650bd0 100644 --- a/libs/libmad/Makefile +++ b/libs/libmad/Makefile @@ -73,7 +73,7 @@ define Build/UninstallDev endef define Package/libmad/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.so.* $(1)/usr/lib/ endef diff --git a/libs/libmcrypt/Makefile b/libs/libmcrypt/Makefile index 77de1fc73..8e53eebe2 100644 --- a/libs/libmcrypt/Makefile +++ b/libs/libmcrypt/Makefile @@ -64,7 +64,7 @@ define Build/UninstallDev endef define Package/libmcrypt/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmcrypt.so.* $(1)/usr/lib/ endef diff --git a/libs/libnet-1.0.x/Makefile b/libs/libnet-1.0.x/Makefile index 66814b16b..8539df3fa 100644 --- a/libs/libnet-1.0.x/Makefile +++ b/libs/libnet-1.0.x/Makefile @@ -74,7 +74,7 @@ define Build/UninstallDev endef define Package/libnet0/install - install -m0755 -d $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.so.* $(1)/usr/lib/ endef diff --git a/libs/libnet-1.1.x/Makefile b/libs/libnet-1.1.x/Makefile index e67a4d60d..057cc6060 100644 --- a/libs/libnet-1.1.x/Makefile +++ b/libs/libnet-1.1.x/Makefile @@ -73,7 +73,7 @@ define Build/UninstallDev endef define Package/libnet1/install - install -m0755 -d $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.so.* $(1)/usr/lib/ endef diff --git a/libs/libnids/Makefile b/libs/libnids/Makefile index 33c1042bf..faf5c95ec 100644 --- a/libs/libnids/Makefile +++ b/libs/libnids/Makefile @@ -65,7 +65,7 @@ define Build/UninstallDev endef define Package/libnids/install - install -m0755 -d $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnids.so.* $(1)/usr/lib/ endef diff --git a/libs/libol/Makefile b/libs/libol/Makefile index 71f411c67..ac55a5640 100644 --- a/libs/libol/Makefile +++ b/libs/libol/Makefile @@ -61,7 +61,7 @@ define Build/UninstallDev endef define Package/libol/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libol.so.* $(1)/usr/lib/ endef diff --git a/libs/libosip2/Makefile b/libs/libosip2/Makefile index 49ce802e1..b281a0bc5 100644 --- a/libs/libosip2/Makefile +++ b/libs/libosip2/Makefile @@ -67,7 +67,7 @@ define Build/UninstallDev endef define Package/libosip2/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so.* $(1)/usr/lib/ endef diff --git a/libs/libpng/Makefile b/libs/libpng/Makefile index ea5f72923..7eb21a2e1 100644 --- a/libs/libpng/Makefile +++ b/libs/libpng/Makefile @@ -68,7 +68,7 @@ define Build/UninstallDev endef define Package/libpng/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.so.* $(1)/usr/lib/ endef diff --git a/libs/librsync/Makefile b/libs/librsync/Makefile index 2b1142f6f..dc379bcd7 100644 --- a/libs/librsync/Makefile +++ b/libs/librsync/Makefile @@ -60,7 +60,7 @@ define Build/UninstallDev endef define Package/librsync/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/librsync.so.* $(1)/usr/lib/ endef diff --git a/libs/libtasn1/Makefile b/libs/libtasn1/Makefile index bbfeaefe0..f9ef74057 100644 --- a/libs/libtasn1/Makefile +++ b/libs/libtasn1/Makefile @@ -77,7 +77,7 @@ define Build/UninstallDev endef define Package/libtasn1/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtasn1.so.* $(1)/usr/lib/ endef diff --git a/libs/libtool/Makefile b/libs/libtool/Makefile index ca925a6b2..ee7cf1be0 100644 --- a/libs/libtool/Makefile +++ b/libs/libtool/Makefile @@ -72,7 +72,7 @@ define Build/UninstallDev endef define Package/libltdl/install - install -m0755 -d $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libltdl.so.* $(1)/usr/lib/ endef diff --git a/libs/libupnp/Makefile b/libs/libupnp/Makefile index ff81cce1a..8f544c4f8 100644 --- a/libs/libupnp/Makefile +++ b/libs/libupnp/Makefile @@ -57,7 +57,7 @@ define Build/UninstallDev endef define Package/libupnp/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/upnp/bin/lib{ixml,threadutil,upnp}.so $(1)/usr/lib/ endef diff --git a/libs/libusb/Makefile b/libs/libusb/Makefile index e36f7c7ad..ff47c7c81 100644 --- a/libs/libusb/Makefile +++ b/libs/libusb/Makefile @@ -59,7 +59,7 @@ define Build/UninstallDev endef define Package/libusb/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb*.so.* $(1)/usr/lib/ endef diff --git a/libs/libvorbisidec/Makefile b/libs/libvorbisidec/Makefile index f1ab745a8..b00ef97ec 100644 --- a/libs/libvorbisidec/Makefile +++ b/libs/libvorbisidec/Makefile @@ -61,7 +61,7 @@ define Build/UninstallDev endef define Package/libvorbisidec/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.so.* $(1)/usr/lib/ endef diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile index f8bf5c012..045f4cbcc 100644 --- a/libs/libxml2/Makefile +++ b/libs/libxml2/Makefile @@ -100,7 +100,7 @@ define Build/UninstallDev endef define Package/libxml2/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.so.* $(1)/usr/lib/ endef diff --git a/libs/libxslt/Makefile b/libs/libxslt/Makefile index 0144aab2e..8c0cb389c 100644 --- a/libs/libxslt/Makefile +++ b/libs/libxslt/Makefile @@ -84,7 +84,7 @@ define Build/UninstallDev endef define Package/libxslt/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxslt.so.* $(1)/usr/lib/ endef diff --git a/libs/lzo/Makefile b/libs/lzo/Makefile index 1c88888fa..18b04c6f0 100644 --- a/libs/lzo/Makefile +++ b/libs/lzo/Makefile @@ -57,7 +57,7 @@ define Build/UninstallDev endef define Package/liblzo/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo2.so.* $(1)/usr/lib endef diff --git a/libs/matrixssl/Makefile b/libs/matrixssl/Makefile index 22fb87557..47d5cb4a8 100644 --- a/libs/matrixssl/Makefile +++ b/libs/matrixssl/Makefile @@ -53,7 +53,7 @@ define Build/UninstallDev endef define Package/libmatrixssl/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so.* $(1)/usr/lib/ endef diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile index 9b2fd8bd2..b8fa6e644 100644 --- a/libs/mysql/Makefile +++ b/libs/mysql/Makefile @@ -112,7 +112,7 @@ define Build/UninstallDev endef define Package/libmysqlclient/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(1)/usr/lib/ endef diff --git a/libs/ncurses/Makefile b/libs/ncurses/Makefile index 2eee9cd63..2da60b969 100644 --- a/libs/ncurses/Makefile +++ b/libs/ncurses/Makefile @@ -127,9 +127,9 @@ define Build/Compile endef define Package/libncurses/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu}*.so.* $(1)/usr/lib/ - install -d -m0755 $(1)/usr/share/terminfo + $(INSTALL_DIR) $(1)/usr/share/terminfo (cd $(PKG_INSTALL_DIR)/usr/share/terminfo; \ for dir in ??; do \ [ -d "$$$$dir" ] || continue; \ @@ -137,7 +137,7 @@ define Package/libncurses/install done \ ) for file in a/ansi d/dumb l/linux r/rxvt s/screen v/vt100 v/vt102 x/xterm x/xterm-color; do \ - install -d -m0755 $(1)/usr/share/terminfo/`dirname $$$$file`; \ + $(INSTALL_DIR) $(1)/usr/share/terminfo/`dirname $$$$file`; \ $(CP) $(PKG_INSTALL_DIR)/usr/share/terminfo/$$$$file \ $(1)/usr/share/terminfo/$$$$file; \ done diff --git a/libs/net-snmp/Makefile b/libs/net-snmp/Makefile index 1ac628f13..02e30bc51 100644 --- a/libs/net-snmp/Makefile +++ b/libs/net-snmp/Makefile @@ -223,34 +223,34 @@ define Build/Compile endef define Package/libnetsnmp/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.so.* $(1)/usr/lib/ endef define Package/snmpd/install - install -d -m0755 $(1)/etc/snmp - install -m0644 ./files/snmpd.conf $(1)/etc/snmp/snmpd.conf - install -d -m0755 $(1)/etc/default - install -m0644 ./files/snmpd.default $(1)/etc/default/snmpd - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/snmpd.init $(1)/etc/init.d/snmpd - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/snmpd-shared $(1)/usr/sbin/snmpd + $(INSTALL_DIR) $(1)/etc/snmp + $(INSTALL_DATA) ./files/snmpd.conf $(1)/etc/snmp/snmpd.conf + $(INSTALL_DIR) $(1)/etc/default + $(INSTALL_DATA) ./files/snmpd.default $(1)/etc/default/snmpd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/snmpd.init $(1)/etc/init.d/snmpd + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/snmpd-shared $(1)/usr/sbin/snmpd endef define Package/snmpd-static/install - install -d -m0755 $(1)/etc/snmp - install -m0644 ./files/snmpd.conf $(1)/etc/snmp/snmpd.conf - install -d -m0755 $(1)/etc/default - install -m0644 ./files/snmpd.default $(1)/etc/default/snmpd - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/snmpd.init $(1)/etc/init.d/snmpd - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/snmpd-static $(1)/usr/sbin/snmpd + $(INSTALL_DIR) $(1)/etc/snmp + $(INSTALL_DATA) ./files/snmpd.conf $(1)/etc/snmp/snmpd.conf + $(INSTALL_DIR) $(1)/etc/default + $(INSTALL_DATA) ./files/snmpd.default $(1)/etc/default/snmpd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/snmpd.init $(1)/etc/init.d/snmpd + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/snmpd-static $(1)/usr/sbin/snmpd endef define Package/snmp-utils/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/snmp{get,set,status,test,trap,walk} $(1)/usr/bin/ endef diff --git a/libs/opencdk/Makefile b/libs/opencdk/Makefile index a9f3f77bc..296f72dd8 100644 --- a/libs/opencdk/Makefile +++ b/libs/opencdk/Makefile @@ -79,7 +79,7 @@ define Build/UninstallDev endef define Package/libopencdk/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libopencdk.so.* $(1)/usr/lib/ endef diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile index 35006b284..406880030 100644 --- a/libs/openldap/Makefile +++ b/libs/openldap/Makefile @@ -158,16 +158,16 @@ define Build/UninstallDev endef define Package/libopenldap/install - install -d -m0755 $(1)/etc/openldap + $(INSTALL_DIR) $(1)/etc/openldap $(CP) $(PKG_INSTALL_DIR)/etc/openldap/ldap.conf $(1)/etc/openldap/ - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.so.* $(1)/usr/lib/ - install -d -m0755 $(1)/usr/share/openldap + $(INSTALL_DIR) $(1)/usr/share/openldap $(CP) $(PKG_INSTALL_DIR)/usr/share/openldap/* $(1)/usr/share/openldap/ endef define Package/openldap-utils/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/ldap* $(1)/usr/bin/ endef diff --git a/libs/pcre/Makefile b/libs/pcre/Makefile index f1ed42e6b..a3229cefc 100644 --- a/libs/pcre/Makefile +++ b/libs/pcre/Makefile @@ -65,7 +65,7 @@ define Build/UninstallDev endef define Package/libpcre/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/.libs/libpcre{,posix}.so.* $(1)/usr/lib/ endef diff --git a/libs/popt/Makefile b/libs/popt/Makefile index d779a8547..d7c833100 100644 --- a/libs/popt/Makefile +++ b/libs/popt/Makefile @@ -56,7 +56,7 @@ define Build/UninstallDev endef define Package/libpopt/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpopt.so.* $(1)/usr/lib/ endef diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile index 3bb14c5f3..7bb3f5332 100644 --- a/libs/postgresql/Makefile +++ b/libs/postgresql/Makefile @@ -106,12 +106,12 @@ define Build/Compile endef define Package/libpq/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpq.so.* $(1)/usr/lib/ endef define Package/pgsql-cli/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/psql $(1)/usr/bin/ endef diff --git a/libs/radiusclient-ng/Makefile b/libs/radiusclient-ng/Makefile index 1d6b343f3..f752ae3db 100644 --- a/libs/radiusclient-ng/Makefile +++ b/libs/radiusclient-ng/Makefile @@ -85,14 +85,14 @@ define Build/UninstallDev endef define Package/libradiusclient-ng/install - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/radiusclient-ng $(1)/etc/ - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libradiusclient-ng.so.* $(1)/usr/lib/ endef define Package/radiusclient-ng/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rad{acct,iusclient,login,status} $(1)/usr/sbin/ endef diff --git a/libs/readline/Makefile b/libs/readline/Makefile index cf6e737fc..d61f36068 100644 --- a/libs/readline/Makefile +++ b/libs/readline/Makefile @@ -64,7 +64,7 @@ define Build/UninstallDev endef define Package/libreadline/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.so.* $(1)/usr/lib/ endef diff --git a/libs/rrdtool-1.0.x/Makefile b/libs/rrdtool-1.0.x/Makefile index 0fb1c3007..e3f9d2cde 100644 --- a/libs/rrdtool-1.0.x/Makefile +++ b/libs/rrdtool-1.0.x/Makefile @@ -136,17 +136,17 @@ define Build/Compile endef define Package/rrdtool1/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrd{tool,update} $(1)/usr/bin/ endef define Package/rrdcgi1/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/ endef define Package/librrd1/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(1)/usr/lib/ endef diff --git a/libs/serdisplib/Makefile b/libs/serdisplib/Makefile index 002013a26..bd9dbe558 100644 --- a/libs/serdisplib/Makefile +++ b/libs/serdisplib/Makefile @@ -56,7 +56,7 @@ define Build/UninstallDev endef define Package/serdisplib/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/lib/libserdisp.so.* $(1)/usr/lib endef diff --git a/libs/speex/Makefile b/libs/speex/Makefile index cf720dca1..271cb704c 100644 --- a/libs/speex/Makefile +++ b/libs/speex/Makefile @@ -73,7 +73,7 @@ define Build/UninstallDev endef define Package/libspeex/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.so.* $(1)/usr/lib/ endef diff --git a/libs/sqlite2/Makefile b/libs/sqlite2/Makefile index c3655a058..432e90b93 100644 --- a/libs/sqlite2/Makefile +++ b/libs/sqlite2/Makefile @@ -94,12 +94,12 @@ define Build/UninstallDev endef define Package/libsqlite2/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite.so.* $(1)/usr/lib/ endef define Package/sqlite2-cli/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/sqlite $(1)/usr/bin/ endef diff --git a/libs/sqlite3/Makefile b/libs/sqlite3/Makefile index d6488c0ba..4d9103873 100644 --- a/libs/sqlite3/Makefile +++ b/libs/sqlite3/Makefile @@ -93,12 +93,12 @@ define Build/UninstallDev endef define Package/libsqlite3/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.so.* $(1)/usr/lib/ endef define Package/sqlite3-cli/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/sqlite3 $(1)/usr/bin/ endef diff --git a/libs/uclibc++/Makefile b/libs/uclibc++/Makefile index 552b188f5..1ce921439 100644 --- a/libs/uclibc++/Makefile +++ b/libs/uclibc++/Makefile @@ -57,7 +57,7 @@ define Build/Compile endef define Package/uclibcxx/install - install -m0755 -d $(1)/lib + $(INSTALL_DIR) $(1)/lib $(CP) $(PKG_BUILD_DIR)/src/libuClibc++*.so.* $(1)/lib/ $(CP) $(PKG_BUILD_DIR)/src/libuClibc++-*.so $(1)/lib/ endef diff --git a/libs/ustl/Makefile b/libs/ustl/Makefile index 8b1fc5d39..ae1a2647c 100644 --- a/libs/ustl/Makefile +++ b/libs/ustl/Makefile @@ -50,7 +50,7 @@ define Build/Compile endef define Package/ustl/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.so.* $(1)/usr/lib/ endef diff --git a/multimedia/gphoto2/Makefile b/multimedia/gphoto2/Makefile index 67cdc4eb8..2af8dfe80 100644 --- a/multimedia/gphoto2/Makefile +++ b/multimedia/gphoto2/Makefile @@ -52,7 +52,7 @@ define Build/Compile endef define Package/gphoto2/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/gphoto2 $(1)/usr/bin/ endef diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index 512617c9d..4cbe2c728 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -50,9 +50,9 @@ define Build/Compile endef define Package/motion/install - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/motion-dist.conf $(1)/etc/motion.conf - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/motion $(1)/usr/bin/ endef diff --git a/multimedia/palantir/Makefile b/multimedia/palantir/Makefile index f8b8800f2..d8e76662c 100644 --- a/multimedia/palantir/Makefile +++ b/multimedia/palantir/Makefile @@ -54,10 +54,10 @@ define Build/Compile endef define Package/palantir/install - install -d -m0755 $(1)/etc - install -m0644 $(PKG_BUILD_DIR)/server/palantir-mips.conf.sample $(1)/etc/palantir.conf - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/server/palantir $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/server/palantir-mips.conf.sample $(1)/etc/palantir.conf + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/server/palantir $(1)/usr/sbin/ endef $(eval $(call BuildPackage,palantir)) diff --git a/multimedia/peercast/Makefile b/multimedia/peercast/Makefile index 6988ae464..a9f299ec0 100644 --- a/multimedia/peercast/Makefile +++ b/multimedia/peercast/Makefile @@ -55,14 +55,14 @@ define Build/Compile endef define Package/peercast/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/peercast $(1)/usr/sbin/ - install -d -m0755 $(1)/usr/share/peercast/html + $(INSTALL_DIR) $(1)/usr/share/peercast/html $(CP) $(PKG_INSTALL_DIR)/usr/share/peercast/html/en $(1)/usr/share/peercast/html/ - install -d -m0755 $(1)/etc - install -m0644 ./files/peercast.ini $(1)/etc/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/peercast.init $(1)/etc/init.d/peercast + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/peercast.ini $(1)/etc/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/peercast.init $(1)/etc/init.d/peercast endef $(eval $(call BuildPackage,peercast)) diff --git a/net/aircrack-ng/Makefile b/net/aircrack-ng/Makefile index 5f0a40c13..e1777449d 100644 --- a/net/aircrack-ng/Makefile +++ b/net/aircrack-ng/Makefile @@ -45,13 +45,13 @@ define Build/Compile endef define Package/aircrack-ng/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/aircrack-ng $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/airdecap-ng $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/packetforge-ng $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ivstools $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/kstats $(1)/usr/bin/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/aireplay-ng $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/airodump-ng $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/airmon-ng $(1)/usr/sbin/ diff --git a/net/amwall/Makefile b/net/amwall/Makefile index f9a435022..4a1d983ce 100644 --- a/net/amwall/Makefile +++ b/net/amwall/Makefile @@ -46,11 +46,11 @@ define Build/Compile endef define Package/amwall/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin - install -d -m0755 $(1)/etc/amsel + $(INSTALL_DIR) $(1)/etc/amsel $(CP) $(PKG_INSTALL_DIR)/etc/amsel* $(1)/etc endef diff --git a/net/aodv-uu/Makefile b/net/aodv-uu/Makefile index 79be57dd2..9d5d7bc61 100644 --- a/net/aodv-uu/Makefile +++ b/net/aodv-uu/Makefile @@ -74,14 +74,14 @@ define Build/Compile endef define Package/aodv-uu/install - install -m0755 -d $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/aodvd $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/aodvd $(1)/usr/sbin endef define Package/kmod-aodv-uu/install mkdir -p $(1)/etc/modules.d - install -m0644 ./files/aodv-uu.modules $(1)/etc/modules.d/80-aodv-uu - install -m0755 -d $(1)/lib/modules/$(LINUX_VERSION) + $(INSTALL_DATA) ./files/aodv-uu.modules $(1)/etc/modules.d/80-aodv-uu + $(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION) $(CP) $(PKG_BUILD_DIR)/lnx/kaodv.$(LINUX_KMOD_SUFFIX) $(1)/lib/modules/$(LINUX_VERSION)/ endef diff --git a/net/arpd/Makefile b/net/arpd/Makefile index f073edd72..1fe651109 100644 --- a/net/arpd/Makefile +++ b/net/arpd/Makefile @@ -45,8 +45,8 @@ define Build/Compile endef define Package/arpd/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/arpd $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/arpd $(1)/usr/sbin/ endef $(eval $(call BuildPackage,arpd)) diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile index a709abbf5..21a2177a6 100644 --- a/net/arpwatch/Makefile +++ b/net/arpwatch/Makefile @@ -44,9 +44,9 @@ define Build/Compile endef define Package/arpwatch/install - install -d -m0755 $(1)/etc/arpwatch + $(INSTALL_DIR) $(1)/etc/arpwatch $(CP) $(PKG_BUILD_DIR)/arp.dat $(1)/etc/arpwatch/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/arp{watch,snmp} $(1)/usr/sbin/ endef diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 80cfb2307..49e228a0c 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -385,131 +385,131 @@ define Package/asterisk/install rm -f skinny.conf ; \ rm -f dundi.conf ; \ ) - install -m0644 ./files/modules.conf $(1)/etc/asterisk/ - install -d -m0755 $(1)/etc/default - install -m0644 ./files/asterisk.default $(1)/etc/default/asterisk - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/asterisk.init $(1)/etc/init.d/asterisk + $(INSTALL_DATA) ./files/modules.conf $(1)/etc/asterisk/ + $(INSTALL_DIR) $(1)/etc/default + $(INSTALL_DATA) ./files/asterisk.default $(1)/etc/default/asterisk + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/asterisk.init $(1)/etc/init.d/asterisk endef define Package/asterisk-mini/install - install -d -m0755 $(1)/etc/asterisk + $(INSTALL_DIR) $(1)/etc/asterisk for f in asterisk enum extconfig extensions features iax iaxprov logger manager modules musiconhold rtp sip; do \ $(CP) $(PKG_INSTALL_DIR)/etc/asterisk/$$$$f.conf $(1)/etc/asterisk/ ; \ done - install -m0644 ./files/modules.conf $(1)/etc/asterisk/ - install -d -m0755 $(1)/usr/lib/asterisk + $(INSTALL_DATA) ./files/modules.conf $(1)/etc/asterisk/ + $(INSTALL_DIR) $(1)/usr/lib/asterisk $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/firmware $(1)/usr/lib/asterisk/ - install -d -m0755 $(1)/usr/lib/asterisk/keys - install -d -m0755 $(1)/usr/lib/asterisk/modules + $(INSTALL_DIR) $(1)/usr/lib/asterisk/keys + $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules for f in chan_iax2 chan_local chan_sip codec_gsm codec_ulaw format_gsm format_pcm format_wav \ format_wav_gsm pbx_config res_features res_musiconhold; do \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/$$$$f.so $(1)/usr/lib/asterisk/modules/ ; \ done - install -d -m0755 $(1)/usr/lib/asterisk/mohmp3 - install -d -m0755 $(1)/usr/lib/asterisk/sounds - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/lib/asterisk/mohmp3 + $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/asterisk $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/safe_asterisk $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/default - install -m0644 ./files/asterisk.default $(1)/etc/default/asterisk - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/asterisk.init $(1)/etc/init.d/asterisk + $(INSTALL_DIR) $(1)/etc/default + $(INSTALL_DATA) ./files/asterisk.default $(1)/etc/default/asterisk + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/asterisk.init $(1)/etc/init.d/asterisk endef define Package/asterisk-mysql/install - install -d -m0755 $(1)/etc/asterisk + $(INSTALL_DIR) $(1)/etc/asterisk install -m0600 $(PKG_BUILD_DIR)/configs/cdr_mysql.conf.sample $(1)/etc/asterisk/cdr_mysql.conf - install -d -m0755 $(1)/usr/lib/asterisk/modules - install -m0755 $(PKG_BUILD_DIR)/apps/app_sql_mysql.so $(1)/usr/lib/asterisk/modules/ - install -m0755 $(PKG_BUILD_DIR)/cdr/cdr_mysql.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/app_sql_mysql.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/cdr/cdr_mysql.so $(1)/usr/lib/asterisk/modules/ endef define Package/asterisk-pgsql/install - install -d -m0755 $(1)/etc/asterisk + $(INSTALL_DIR) $(1)/etc/asterisk install -m0600 $(PKG_BUILD_DIR)/configs/cdr_pgsql.conf.sample $(1)/etc/asterisk/cdr_pgsql.conf - install -d -m0755 $(1)/usr/lib/asterisk/modules - install -m0755 $(PKG_BUILD_DIR)/apps/app_sql_postgres.so $(1)/usr/lib/asterisk/modules/ - install -m0755 $(PKG_BUILD_DIR)/cdr/cdr_pgsql.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/app_sql_postgres.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/cdr/cdr_pgsql.so $(1)/usr/lib/asterisk/modules/ endef define Package/asterisk-sqlite/install - install -d -m0755 $(1)/usr/lib/asterisk/modules - install -m0755 $(PKG_BUILD_DIR)/cdr/cdr_sqlite.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules + $(INSTALL_BIN) $(PKG_BUILD_DIR)/cdr/cdr_sqlite.so $(1)/usr/lib/asterisk/modules/ endef define Package/asterisk-sounds/install - install -d -m0755 $(1)/usr/lib/asterisk/sounds + $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds $(CP) $(PKG_BUILD_DIR)/sounds/* $(1)/usr/lib/asterisk/sounds/ rm -f $(1)/usr/lib/asterisk/sounds/*.mp3 rm -f $(1)/usr/lib/asterisk/sounds/vm-* endef define Package/asterisk-voicemail/install - install -d -m0755 $(1)/etc/asterisk - install -m0644 $(PKG_BUILD_DIR)/configs/voicemail.conf.sample $(1)/etc/asterisk/voicemail.conf - install -d -m0755 $(1)/usr/lib/asterisk/modules - install -m0755 $(PKG_BUILD_DIR)/apps/*voicemail.so $(1)/usr/lib/asterisk/modules/ - install -m0755 $(PKG_BUILD_DIR)/res/res_adsi.so $(1)/usr/lib/asterisk/modules/ - install -d -m0755 $(1)/usr/lib/asterisk/sounds + $(INSTALL_DIR) $(1)/etc/asterisk + $(INSTALL_DATA) $(PKG_BUILD_DIR)/configs/voicemail.conf.sample $(1)/etc/asterisk/voicemail.conf + $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/*voicemail.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/res/res_adsi.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds $(CP) $(PKG_BUILD_DIR)/sounds/vm-*.gsm $(1)/usr/lib/asterisk/sounds/ endef define Package/asterisk-chan-bluetooth/install - install -d -m0755 $(1)/etc/asterisk - install -m0644 $(PKG_BUILD_DIR)/configs/bluetooth.conf $(1)/etc/asterisk/bluetooth.conf - install -d -m0755 $(1)/usr/lib/asterisk/modules - install -m0755 $(PKG_BUILD_DIR)/channels/chan_bluetooth.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_DIR) $(1)/etc/asterisk + $(INSTALL_DATA) $(PKG_BUILD_DIR)/configs/bluetooth.conf $(1)/etc/asterisk/bluetooth.conf + $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules + $(INSTALL_BIN) $(PKG_BUILD_DIR)/channels/chan_bluetooth.so $(1)/usr/lib/asterisk/modules/ endef define Package/asterisk-chan-h323/install - install -d -m0755 $(1)/etc/asterisk - install -m0644 $(PKG_BUILD_DIR)/channels/h323/h323.conf.sample $(1)/etc/asterisk/h323.conf - install -d -m0755 $(1)/usr/lib/asterisk/modules - install -m0755 $(PKG_BUILD_DIR)/channels/chan_h323.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_DIR) $(1)/etc/asterisk + $(INSTALL_DATA) $(PKG_BUILD_DIR)/channels/h323/h323.conf.sample $(1)/etc/asterisk/h323.conf + $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules + $(INSTALL_BIN) $(PKG_BUILD_DIR)/channels/chan_h323.so $(1)/usr/lib/asterisk/modules/ endef define Package/asterisk-chan-mgcp/install - install -d -m0755 $(1)/etc/asterisk - install -m0644 $(PKG_BUILD_DIR)/configs/mgcp.conf.sample $(1)/etc/asterisk/mgcp.conf - install -d -m0755 $(1)/usr/lib/asterisk/modules - install -m0755 $(PKG_BUILD_DIR)/channels/chan_mgcp.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_DIR) $(1)/etc/asterisk + $(INSTALL_DATA) $(PKG_BUILD_DIR)/configs/mgcp.conf.sample $(1)/etc/asterisk/mgcp.conf + $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules + $(INSTALL_BIN) $(PKG_BUILD_DIR)/channels/chan_mgcp.so $(1)/usr/lib/asterisk/modules/ endef define Package/asterisk-chan-skinny/install - install -d -m0755 $(1)/etc/asterisk - install -m0644 $(PKG_BUILD_DIR)/configs/skinny.conf.sample $(1)/etc/asterisk/skinny.conf - install -d -m0755 $(1)/usr/lib/asterisk/modules - install -m0755 $(PKG_BUILD_DIR)/channels/chan_skinny.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_DIR) $(1)/etc/asterisk + $(INSTALL_DATA) $(PKG_BUILD_DIR)/configs/skinny.conf.sample $(1)/etc/asterisk/skinny.conf + $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules + $(INSTALL_BIN) $(PKG_BUILD_DIR)/channels/chan_skinny.so $(1)/usr/lib/asterisk/modules/ endef define Package/asterisk-code-ilbc/install - install -d -m0755 $(1)/usr/lib/asterisk/modules - install -m0755 $(PKG_BUILD_DIR)/codecs/codec_ilbc.so $(1)/usr/lib/asterisk/modules/ - install -m0755 $(PKG_BUILD_DIR)/formats/format_ilbc.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules + $(INSTALL_BIN) $(PKG_BUILD_DIR)/codecs/codec_ilbc.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/formats/format_ilbc.so $(1)/usr/lib/asterisk/modules/ endef define Package/asterisk-codec-lpc10/install - install -d -m0755 $(1)/usr/lib/asterisk/modules - install -m0755 $(PKG_BUILD_DIR)/codecs/codec_lpc10.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules + $(INSTALL_BIN) $(PKG_BUILD_DIR)/codecs/codec_lpc10.so $(1)/usr/lib/asterisk/modules/ endef define Package/asterisk-codec-speex/install - install -d -m0755 $(1)/usr/lib/asterisk/modules - install -m0755 $(PKG_BUILD_DIR)/codecs/codec_speex.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules + $(INSTALL_BIN) $(PKG_BUILD_DIR)/codecs/codec_speex.so $(1)/usr/lib/asterisk/modules/ endef define Package/asterisk-pbx-dundi/install - install -d -m0755 $(1)/etc/asterisk - install -m0644 $(PKG_BUILD_DIR)/configs/dundi.conf.sample $(1)/etc/asterisk/dundi.conf - install -d -m0755 $(1)/usr/lib/asterisk/modules - install -m0755 $(PKG_BUILD_DIR)/pbx/pbx_dundi.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_DIR) $(1)/etc/asterisk + $(INSTALL_DATA) $(PKG_BUILD_DIR)/configs/dundi.conf.sample $(1)/etc/asterisk/dundi.conf + $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules + $(INSTALL_BIN) $(PKG_BUILD_DIR)/pbx/pbx_dundi.so $(1)/usr/lib/asterisk/modules/ endef define Package/asterisk-res-agi/install - install -d -m0755 $(1)/usr/lib/asterisk/agi-bin - install -d -m0755 $(1)/usr/lib/asterisk/modules - install -m0755 $(PKG_BUILD_DIR)/res/res_agi.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_DIR) $(1)/usr/lib/asterisk/agi-bin + $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules + $(INSTALL_BIN) $(PKG_BUILD_DIR)/res/res_agi.so $(1)/usr/lib/asterisk/modules/ endef $(eval $(call BuildPackage,asterisk)) diff --git a/net/atftp/Makefile b/net/atftp/Makefile index bb3d8d492..9e3a8d7cb 100644 --- a/net/atftp/Makefile +++ b/net/atftp/Makefile @@ -63,13 +63,13 @@ define Build/Compile endef define Package/atftp/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/atftp $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/atftp $(1)/usr/sbin endef define Package/atftpd/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/atftpd $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/atftpd $(1)/usr/sbin/ endef $(eval $(call BuildPackage,atftp)) diff --git a/net/autossh/Makefile b/net/autossh/Makefile index 670c7ffe9..6c5efc004 100644 --- a/net/autossh/Makefile +++ b/net/autossh/Makefile @@ -37,8 +37,8 @@ define Build/Compile endef define Package/autossh/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/autossh $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/autossh $(1)/usr/sbin/ endef $(eval $(call BuildPackage,autossh)) diff --git a/net/bind/Makefile b/net/bind/Makefile index 1844b050e..b8a9c231a 100644 --- a/net/bind/Makefile +++ b/net/bind/Makefile @@ -96,25 +96,25 @@ define Build/Compile endef define Package/bind-server/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named $(1)/usr/sbin/ - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc $(CP) ./files/bind $(1)/etc/ - install -d -m0755 $(1)/etc/init.d + $(INSTALL_DIR) $(1)/etc/init.d $(CP) ./files/named.init $(1)/etc/init.d/named find $(1)/etc/bind/ -name ".svn" | xargs rm -rf endef define Package/bind-client/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/nsupdate $(1)/usr/bin/ endef define Package/bind-tools/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/dig $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/host $(1)/usr/bin/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-keygen $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-signzone $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named-checkconf $(1)/usr/sbin/ @@ -124,30 +124,30 @@ define Package/bind-tools/install endef define Package/bind-rndc/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rndc $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rndc-confgen $(1)/usr/sbin/ endef define Package/bind-check/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named-checkconf $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named-checkzone $(1)/usr/sbin/ endef define Package/bind-dnssec/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-keygen $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-signzone $(1)/usr/sbin/ endef define Package/bind-host/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/host $(1)/usr/bin/ endef define Package/bind-dig/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/dig $(1)/usr/bin/ endef diff --git a/net/bing/Makefile b/net/bing/Makefile index 648dac002..a42ae3949 100644 --- a/net/bing/Makefile +++ b/net/bing/Makefile @@ -36,7 +36,7 @@ define Build/Compile endef define Package/bing/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/bing $(1)/usr/sbin/ endef diff --git a/net/bitchx/Makefile b/net/bitchx/Makefile index f7d9eaf38..04202d338 100644 --- a/net/bitchx/Makefile +++ b/net/bitchx/Makefile @@ -47,15 +47,15 @@ define Build/Compile mkdir -p $(PKG_INSTALL_DIR)/usr/lib/bx/translation mkdir -p $(PKG_INSTALL_DIR)/usr/lib/bx/plugins mkdir -p $(PKG_INSTALL_DIR)/usr/lib/bx/help - install -c $(PKG_BUILD_DIR)/source/BitchX $(PKG_INSTALL_DIR)/usr/bin/BitchX-1.1-final + $(INSTALL_BIN) $(PKG_BUILD_DIR)/source/BitchX $(PKG_INSTALL_DIR)/usr/bin/BitchX-1.1-final rm -f $(PKG_INSTALL_DIR)/usr/bin/BitchX ln -s /usr/bin/BitchX-1.1-final $(PKG_INSTALL_DIR)/usr/bin/BitchX - install -c $(PKG_BUILD_DIR)/BitchX.help $(PKG_INSTALL_DIR)/usr/lib/bx/BitchX.help - install -c $(PKG_BUILD_DIR)/BitchX.ircnames $(PKG_INSTALL_DIR)/usr/lib/bx/BitchX.ircnames - install -c $(PKG_BUILD_DIR)/BitchX.quit $(PKG_INSTALL_DIR)/usr/lib/bx/BitchX.quit - install -c $(PKG_BUILD_DIR)/BitchX.reasons $(PKG_INSTALL_DIR)/usr/lib/bx/BitchX.kick - install -c $(PKG_BUILD_DIR)/source/wserv $(PKG_INSTALL_DIR)/usr/lib/bx/wserv - install -c $(PKG_BUILD_DIR)/source/scr-bx $(PKG_INSTALL_DIR)/usr/bin/scr-bx + $(INSTALL_DATA) $(PKG_BUILD_DIR)/BitchX.help $(PKG_INSTALL_DIR)/usr/lib/bx/BitchX.help + $(INSTALL_DATA) $(PKG_BUILD_DIR)/BitchX.ircnames $(PKG_INSTALL_DIR)/usr/lib/bx/BitchX.ircnames + $(INSTALL_DATA) $(PKG_BUILD_DIR)/BitchX.quit $(PKG_INSTALL_DIR)/usr/lib/bx/BitchX.quit + $(INSTALL_DATA) $(PKG_BUILD_DIR)/BitchX.reasons $(PKG_INSTALL_DIR)/usr/lib/bx/BitchX.kick + $(INSTALL_DATA) $(PKG_BUILD_DIR)/source/wserv $(PKG_INSTALL_DIR)/usr/lib/bx/wserv + $(INSTALL_BIN) $(PKG_BUILD_DIR)/source/scr-bx $(PKG_INSTALL_DIR)/usr/bin/scr-bx $(CP) $(PKG_BUILD_DIR)/script $(PKG_INSTALL_DIR)/usr/lib/bx/ $(CP) $(PKG_BUILD_DIR)/translation $(PKG_INSTALL_DIR)/usr/lib/bx/ bzip2 $(PKG_INSTALL_DIR)/usr/lib/bx/translation/* @@ -64,7 +64,7 @@ define Build/Compile endef define Package/bitchx/install - install -m0755 -d $(1)/usr/bin $(1)/usr/lib $(1)/etc/init.d $(1)/tmp + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib $(1)/etc/init.d $(1)/tmp $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/etc/init.d/bitchxrc $(1)/etc/init.d/ diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile index 5d2ff8a61..b3d8a23b6 100644 --- a/net/bitlbee/Makefile +++ b/net/bitlbee/Makefile @@ -79,8 +79,8 @@ define Package/bitlbee/install DESTDIR="$(1)" install-etc install-bin $(MAKE) -C $(PKG_BUILD_DIR)/doc/user-guide \ DESTDIR="$(1)" install - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/bitlbee.init $(1)/etc/init.d/bitlbee + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/bitlbee.init $(1)/etc/init.d/bitlbee endef $(eval $(call BuildPackage,bitlbee)) diff --git a/net/bmon/Makefile b/net/bmon/Makefile index 8f9f7326b..0f5f0aaa7 100644 --- a/net/bmon/Makefile +++ b/net/bmon/Makefile @@ -48,8 +48,8 @@ define Build/Compile endef define Package/bmon/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/src/bmon $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/bmon $(1)/usr/sbin/ endef $(eval $(call BuildPackage,bmon)) diff --git a/net/bwm/Makefile b/net/bwm/Makefile index 860dd3017..a58c5cbf4 100644 --- a/net/bwm/Makefile +++ b/net/bwm/Makefile @@ -34,7 +34,7 @@ endef define Package/bwm/install mkdir -p $(1)/usr/bin - install -m 755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ endef $(eval $(call BuildPackage,bwm)) diff --git a/net/cbtt/Makefile b/net/cbtt/Makefile index 2869a71d0..a271f8bb1 100644 --- a/net/cbtt/Makefile +++ b/net/cbtt/Makefile @@ -54,13 +54,13 @@ define Build/Compile endef define Package/cbtt/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/bnbt $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bnbt $(1)/usr/bin/ endef define Package/cbtt-mysql/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/bnbtmysql $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bnbtmysql $(1)/usr/bin/ endef $(eval $(call BuildPackage,cbtt)) diff --git a/net/chillispot/Makefile b/net/chillispot/Makefile index a8b1920a7..1d870ac42 100644 --- a/net/chillispot/Makefile +++ b/net/chillispot/Makefile @@ -51,11 +51,11 @@ define Build/Compile endef define Package/chillispot/install - install -m0755 -d $(1)/etc/init.d - install -m0755 ./files/$(PKG_NAME).init $(1)/etc/init.d/chilli - install -m0755 -d $(1)/etc - install -m0644 $(PKG_BUILD_DIR)/doc/chilli.conf $(1)/etc/ - install -m0755 -d $(1)/usr/sbin + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/chilli + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/chilli.conf $(1)/etc/ + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/chilli $(1)/usr/sbin/ endef diff --git a/net/click/Makefile b/net/click/Makefile index 9606e08ce..af39767e7 100644 --- a/net/click/Makefile +++ b/net/click/Makefile @@ -88,19 +88,19 @@ define Build/Compile endef define Package/click/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/userlevel/roofnetclick $(1)/usr/bin/click $(CP) $(PKG_BUILD_DIR)/tools/click-align/click-align $(1)/usr/bin/click-align endef define Package/roofnet/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/conf/wifi/gen_config_roofnet.sh $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/conf/wifi/srcr.click $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/conf/wifi/read_handler $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/conf/wifi/write_handler $(1)/usr/bin mkdir -p $(1)/etc/init.d - install -m 755 ./files/roofnet.init $(1)/etc/init.d/roofnet + $(INSTALL_BIN) ./files/roofnet.init $(1)/etc/init.d/roofnet endef $(eval $(call BuildPackage,click)) diff --git a/net/ctorrent/Makefile b/net/ctorrent/Makefile index 5f1028fb4..bc70f246b 100644 --- a/net/ctorrent/Makefile +++ b/net/ctorrent/Makefile @@ -50,7 +50,7 @@ define Build/Compile endef define Package/ctorrent/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/ctorrent $(1)/usr/bin/ endef diff --git a/net/cups/Makefile b/net/cups/Makefile index e0ec160ea..58145d0e9 100644 --- a/net/cups/Makefile +++ b/net/cups/Makefile @@ -74,28 +74,28 @@ endef define Package/cups/install rm -rf $(1)/etc/cups - install -d -m0755 $(1)/etc/cups + $(INSTALL_DIR) $(1)/etc/cups $(CP) $(PKG_INSTALL_DIR)/etc/cups/* $(1)/etc/cups/ rm -rf $(1)/etc/cups/certs ln -sf /tmp $(1)/etc/cups/certs - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ rm -f $(1)/usr/bin/cups-config - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups $(1)/usr/lib/ - install -d -m0755 $(1)/usr/share/cups/templates + $(INSTALL_DIR) $(1)/usr/share/cups/templates $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/*.tmpl $(1)/usr/share/cups/templates/ - install -d -m0755 $(1)/usr/share/doc/cups + $(INSTALL_DIR) $(1)/usr/share/doc/cups $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/index.html $(1)/usr/share/doc/cups/ $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/images $(1)/usr/share/doc/cups/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ # overwrite default config with our own $(CP) ./files/etc/cups/* $(1)/etc/cups/ # install initscript with priority 60 - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/cupsd.init $(1)/etc/init.d/cupsd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/cupsd.init $(1)/etc/init.d/cupsd endef define Build/InstallDev diff --git a/net/cutter/Makefile b/net/cutter/Makefile index 7c8d5cf61..2b99a551a 100644 --- a/net/cutter/Makefile +++ b/net/cutter/Makefile @@ -35,12 +35,12 @@ endef define Build/Compile $(TARGET_CC) $(PKG_BUILD_DIR)/cutter.c -o $(PKG_BUILD_DIR)/cutter - install -d -m0755 $(PKG_INSTALL_DIR)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/cutter $(PKG_INSTALL_DIR)/usr/sbin/ + $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/cutter $(PKG_INSTALL_DIR)/usr/sbin/ endef define Package/cutter/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/cutter $(1)/usr/sbin/ endef diff --git a/net/dhcp-forwarder/Makefile b/net/dhcp-forwarder/Makefile index dac1cda90..34a608f2d 100644 --- a/net/dhcp-forwarder/Makefile +++ b/net/dhcp-forwarder/Makefile @@ -43,12 +43,12 @@ define Build/Compile endef define Package/dhcp-forwarder/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(1)/usr/bin/ - install -d -m0755 $(1)/etc - install -m0644 $(PKG_BUILD_DIR)/contrib/dhcp-fwd.conf $(1)/etc/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/dhcp-fwd.init $(1)/etc/init.d/dhcp-fwd + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/contrib/dhcp-fwd.conf $(1)/etc/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/dhcp-fwd.init $(1)/etc/init.d/dhcp-fwd endef $(eval $(call BuildPackage,dhcp-forwarder)) diff --git a/net/dhcp/Makefile b/net/dhcp/Makefile index da75804c6..a687e8c59 100644 --- a/net/dhcp/Makefile +++ b/net/dhcp/Makefile @@ -58,12 +58,12 @@ endef define Package/dhcp-relay/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dhcrelay $(1)/usr/sbin/ endef define Package/dhcp-server/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dhcpd $(1)/usr/sbin/ endef diff --git a/net/dsl-qos-queue/Makefile b/net/dsl-qos-queue/Makefile index f1cb4a075..c60e870a6 100644 --- a/net/dsl-qos-queue/Makefile +++ b/net/dsl-qos-queue/Makefile @@ -40,10 +40,10 @@ define Build/Compile endef define Package/dsl-qos-queue/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ - install -m0755 $(PKG_BUILD_DIR)/dsl_qos_train $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/ipt_rules $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/dsl_qos_train $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ipt_rules $(1)/usr/sbin endef $(eval $(call BuildPackage,dsl-qos-queue)) diff --git a/net/dsniff/Makefile b/net/dsniff/Makefile index a47a5b41c..d6a155960 100644 --- a/net/dsniff/Makefile +++ b/net/dsniff/Makefile @@ -52,9 +52,9 @@ define Build/Compile endef define Package/dsniff/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ endef diff --git a/net/ethtool/Makefile b/net/ethtool/Makefile index ff7e6c7a7..f7b5799c2 100644 --- a/net/ethtool/Makefile +++ b/net/ethtool/Makefile @@ -40,7 +40,7 @@ define Build/Compile endef define Package/ethtool/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin endef diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile index 96c1c3781..752307036 100644 --- a/net/ettercap/Makefile +++ b/net/ettercap/Makefile @@ -67,13 +67,13 @@ define Build/Compile endef define Package/ettercap/install - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/etter.conf $(1)/etc/ - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/etter{cap,filter,log} $(1)/usr/bin/ - install -d -m0755 $(1)/usr/lib/ettercap + $(INSTALL_DIR) $(1)/usr/lib/ettercap $(CP) $(PKG_INSTALL_DIR)/usr/lib/ettercap/*.so $(1)/usr/lib/ettercap/ - install -d -m0755 $(1)/usr/share/ettercap + $(INSTALL_DIR) $(1)/usr/share/ettercap $(CP) $(PKG_INSTALL_DIR)/usr/share/ettercap/* $(1)/usr/share/ettercap/ endef diff --git a/net/ez-ipupdate/Makefile b/net/ez-ipupdate/Makefile index 2df2636a4..52c3f6d86 100644 --- a/net/ez-ipupdate/Makefile +++ b/net/ez-ipupdate/Makefile @@ -40,12 +40,12 @@ define Build/Compile endef define Package/ez-ipupdate/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/ez-ipupdate $(1)/usr/sbin/ - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ez-ipupdate $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc install -m0600 ./files/ez-ipupdate.conf $(1)/etc/ - install -d -m0755 $(1)/etc/hotplug.d/iface - install -m0755 ./files/ez-ipupdate.hotplug $(1)/etc/hotplug.d/iface/10-ez-ipupdate + $(INSTALL_DIR) $(1)/etc/hotplug.d/iface + $(INSTALL_BIN) ./files/ez-ipupdate.hotplug $(1)/etc/hotplug.d/iface/10-ez-ipupdate endef $(eval $(call BuildPackage,ez-ipupdate)) diff --git a/net/fping/Makefile b/net/fping/Makefile index 500e4f1bb..953fa8c75 100644 --- a/net/fping/Makefile +++ b/net/fping/Makefile @@ -47,7 +47,7 @@ define Build/Compile endef define Package/fping/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/fping4 $(1)/usr/bin/ $(CP) $(PKG_BUILD_DIR)/fping6 $(1)/usr/bin/ ln -sf fping4 $(1)/usr/bin/fping diff --git a/net/fprobe/Makefile b/net/fprobe/Makefile index a8acaa51b..726445f24 100644 --- a/net/fprobe/Makefile +++ b/net/fprobe/Makefile @@ -44,7 +44,7 @@ define Build/Compile endef define Package/fprobe/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/src/fprobe $(1)/usr/bin/ endef diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index c29de83d2..7493dc164 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -292,25 +292,25 @@ define Build/Compile endef define Package/freeradius/install - install -d -m0755 $(1)/etc/freeradius + $(INSTALL_DIR) $(1)/etc/freeradius for f in clients.conf dictionary radiusd.conf; do \ $(CP) $(PKG_INSTALL_DIR)/etc/freeradius/$$$${f} $(1)/etc/freeradius/ ; \ done - install -d -m0755 $(1)/usr/share/freeradius + $(INSTALL_DIR) $(1)/usr/share/freeradius $(CP) $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary $(1)/usr/share/freeradius/ for f in $(PKG_DICTIONARIES); do \ $(CP) $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary.$$$${f} $(1)/usr/share/freeradius/ ; \ done - install -d -m0755 $(1)/usr/lib/freeradius + $(INSTALL_DIR) $(1)/usr/lib/freeradius $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius/libradius{,-*}.so $(1)/usr/lib/freeradius/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/radiusd $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/radiusd.init $(1)/etc/init.d/radiusd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/radiusd.init $(1)/etc/init.d/radiusd endef define Package/freeradius-democerts/install - install -d -m0755 $(1)/etc/freeradius + $(INSTALL_DIR) $(1)/etc/freeradius $(CP) $(PKG_INSTALL_DIR)/etc/freeradius/certs $(1)/etc/freeradius/ rm -rf $(1)/etc/freeradius/certs/README rm -rf $(1)/etc/freeradius/certs/new* @@ -319,7 +319,7 @@ define Package/freeradius-democerts/install endef define Package/freeradius-utils/install - install -m0755 -d $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin for f in radclient radeapclient; do \ $(CP) $(PKG_INSTALL_DIR)/usr/bin/$$$${f} $(1)/usr/bin/ ; \ done @@ -327,11 +327,11 @@ endef define BuildPlugin define Package/$(1)/install - [ -z "$(2)" ] || install -d -m0755 $$(1)/usr/lib/freeradius + [ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/freeradius for m in $(2); do \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius/$$$$$$$${m}{,-*}.so $$(1)/usr/lib/freeradius/ ; \ done - [ -z "$(3)" ] || install -d -m0755 $$(1)/etc/freeradius + [ -z "$(3)" ] || $(INSTALL_DIR) $$(1)/etc/freeradius for f in $(3); do \ $(CP) $(PKG_INSTALL_DIR)/etc/freeradius/$$$$$$$${f} $$(1)/etc/freeradius/ ; \ done diff --git a/net/frickin/Makefile b/net/frickin/Makefile index 9eb07ee27..0a266833c 100644 --- a/net/frickin/Makefile +++ b/net/frickin/Makefile @@ -45,12 +45,12 @@ define Build/Configure endef define Package/frickin/install - install -d -m0755 $(1)/etc/default - install -m0644 ./files/frickin.default $(1)/etc/default/frickin - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/frickin.init $(1)/etc/init.d/frickin - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/frickin $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc/default + $(INSTALL_DATA) ./files/frickin.default $(1)/etc/default/frickin + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/frickin.init $(1)/etc/init.d/frickin + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/frickin $(1)/usr/sbin/ endef $(eval $(call BuildPackage,frickin)) diff --git a/net/gmediaserver/Makefile b/net/gmediaserver/Makefile index 5e4df2897..84ba442c6 100644 --- a/net/gmediaserver/Makefile +++ b/net/gmediaserver/Makefile @@ -48,12 +48,12 @@ define Build/Compile endef define Package/gmediaserver/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/bin/gmediaserver $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/default - install -m0644 ./files/gmediaserver.default $(1)/etc/default/gmediaserver - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/gmediaserver.init $(1)/etc/init.d/gmediaserver + $(INSTALL_DIR) $(1)/etc/default + $(INSTALL_DATA) ./files/gmediaserver.default $(1)/etc/default/gmediaserver + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/gmediaserver.init $(1)/etc/init.d/gmediaserver endef $(eval $(call BuildPackage,gmediaserver)) diff --git a/net/gpsd/Makefile b/net/gpsd/Makefile index 15f5281e2..883a274de 100644 --- a/net/gpsd/Makefile +++ b/net/gpsd/Makefile @@ -62,10 +62,10 @@ define Build/UninstallDev endef define Package/gpsd/install - install -d -m0755 $(1)/usr/lib - install -m0755 $(PKG_INSTALL_DIR)/usr/lib/libgps.so.* $(1)/usr/lib/ - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/gpsd $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libgps.so.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/gpsd $(1)/usr/sbin/ endef $(eval $(call BuildPackage,gpsd)) diff --git a/net/htpdate/Makefile b/net/htpdate/Makefile index 1d76c6a7e..34abf94df 100644 --- a/net/htpdate/Makefile +++ b/net/htpdate/Makefile @@ -41,12 +41,12 @@ endef define Package/htpdate/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/htpdate $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/default/ - install -m0644 ./files/htpdate.default $(1)/etc/default/htpdate - install -d -m0755 $(1)/etc/init.d/ - install -m0755 ./files/htpdate.init $(1)/etc/init.d/htpdate + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/htpdate $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc/default/ + $(INSTALL_DATA) ./files/htpdate.default $(1)/etc/default/htpdate + $(INSTALL_DIR) $(1)/etc/init.d/ + $(INSTALL_BIN) ./files/htpdate.init $(1)/etc/init.d/htpdate endef $(eval $(call BuildPackage,htpdate)) diff --git a/net/httping/Makefile b/net/httping/Makefile index 7331d4f9b..0d8692d54 100644 --- a/net/httping/Makefile +++ b/net/httping/Makefile @@ -38,8 +38,8 @@ define Build/Compile endef define Package/httping/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/httping $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/httping $(1)/usr/sbin/ endef $(eval $(call BuildPackage,httping)) diff --git a/net/icecast/Makefile b/net/icecast/Makefile index d08b0ecd2..bba34eb10 100644 --- a/net/icecast/Makefile +++ b/net/icecast/Makefile @@ -60,11 +60,11 @@ define Build/Compile endef define Package/icecast/install - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/icecast.xml $(1)/etc/ - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/icecast $(1)/usr/bin/ - install -d -m0755 $(1)/usr/share/icecast + $(INSTALL_DIR) $(1)/usr/share/icecast $(CP) $(PKG_INSTALL_DIR)/usr/share/icecast/admin $(1)/usr/share/icecast/ $(CP) $(PKG_INSTALL_DIR)/usr/share/icecast/web $(1)/usr/share/icecast/ endef diff --git a/net/iftop/Makefile b/net/iftop/Makefile index ba8880da5..3aa917469 100644 --- a/net/iftop/Makefile +++ b/net/iftop/Makefile @@ -42,7 +42,7 @@ define Build/Compile endef define Package/iftop/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iftop $(1)/usr/bin/ endef diff --git a/net/igmpproxy/Makefile b/net/igmpproxy/Makefile index 8bf9d20e7..a0b964405 100644 --- a/net/igmpproxy/Makefile +++ b/net/igmpproxy/Makefile @@ -42,10 +42,10 @@ define Build/Compile endef define Package/igmpproxy/install - install -d -m0755 $(1)/etc - install -m0755 $(PKG_BUILD_DIR)/src/igmpproxy.conf $(1)/etc - install -d -m0755 $(1)/usr/sbin $(1)/etc - install -m0644 $(PKG_BUILD_DIR)/src/igmpproxy $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/igmpproxy.conf $(1)/etc + $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/igmpproxy $(1)/usr/sbin/ endef $(eval $(call BuildPackage,igmpproxy)) diff --git a/net/ipcad/Makefile b/net/ipcad/Makefile index 159b0f5a7..ad6d93d20 100644 --- a/net/ipcad/Makefile +++ b/net/ipcad/Makefile @@ -62,9 +62,9 @@ define Build/Compile endef define Package/ipcad/install - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/ipcad.conf $(1)/etc/ - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/ipcad $(1)/usr/bin/ endef diff --git a/net/iperf/Makefile b/net/iperf/Makefile index 73358c4dc..47b012651 100644 --- a/net/iperf/Makefile +++ b/net/iperf/Makefile @@ -51,7 +51,7 @@ define Build/Compile endef define Package/iperf/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/iperf $(1)/usr/bin endef diff --git a/net/ipkungfu/Makefile b/net/ipkungfu/Makefile index 2135036e0..19723bb03 100644 --- a/net/ipkungfu/Makefile +++ b/net/ipkungfu/Makefile @@ -57,10 +57,10 @@ define Build/Compile endef define Package/ipkungfu/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/dummy_server $(1)/usr/sbin/ $(CP) $(PKG_BUILD_DIR)/ipkungfu $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/ipkungfu/ + $(INSTALL_DIR) $(1)/etc/ipkungfu/ $(CP) $(PKG_BUILD_DIR)/files/conf/* $(1)/etc/ipkungfu/ endef diff --git a/net/iptables-snmp/Makefile b/net/iptables-snmp/Makefile index 519b365ba..b17e9299a 100644 --- a/net/iptables-snmp/Makefile +++ b/net/iptables-snmp/Makefile @@ -40,7 +40,7 @@ define Build/Compile endef define Package/iptables-snmp/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables-snmp.so $(1)/usr/lib endef diff --git a/net/iptraf/Makefile b/net/iptraf/Makefile index afe9e1a57..2cce96f5d 100644 --- a/net/iptraf/Makefile +++ b/net/iptraf/Makefile @@ -49,11 +49,11 @@ define Build/Compile endef define Package/iptraf/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/src/iptraf $(1)/usr/bin/ - install -d -m0755 $(1)/var/lib/iptraf/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/iptraf $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/var/lib/iptraf/ echo "$(PKG_VERSION)" > $(1)/var/lib/iptraf/version - install -d -m0755 $(1)/var/log/iptraf $(1)/var/run/iptraf + $(INSTALL_DIR) $(1)/var/log/iptraf $(1)/var/run/iptraf endef $(eval $(call BuildPackage,iptraf)) diff --git a/net/irssi/Makefile b/net/irssi/Makefile index 024bcfa63..829990220 100644 --- a/net/irssi/Makefile +++ b/net/irssi/Makefile @@ -46,8 +46,8 @@ define Build/Configure endef define Package/irssi/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/src/fe-text/irssi $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/fe-text/irssi $(1)/usr/bin/ endef $(eval $(call BuildPackage,irssi)) diff --git a/net/kismet/Makefile b/net/kismet/Makefile index efeced0c1..53cd8caf2 100644 --- a/net/kismet/Makefile +++ b/net/kismet/Makefile @@ -121,34 +121,34 @@ endef #FIXME: remove this package? define Package/kismet/install - install -d -m0755 $(1)/usr/bin/ - install -m0755 $(PKG_BUILD_DIR)/scripts/kismet $(1)/usr/bin/kismet + $(INSTALL_DIR) $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/kismet $(1)/usr/bin/kismet endef define Package/kismet-client/install - install -d -m0755 $(1)/etc/kismet/ - install -m0644 ./files/ap_manuf $(1)/etc/kismet/ - install -m0644 ./files/client_manuf $(1)/etc/kismet/ - install -m0644 ./files/kismet.conf $(1)/etc/kismet/ - install -m0644 ./files/kismet_ui.conf $(1)/etc/kismet/ - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/kismet_client $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/etc/kismet/ + $(INSTALL_DATA) ./files/ap_manuf $(1)/etc/kismet/ + $(INSTALL_DATA) ./files/client_manuf $(1)/etc/kismet/ + $(INSTALL_DATA) ./files/kismet.conf $(1)/etc/kismet/ + $(INSTALL_DATA) ./files/kismet_ui.conf $(1)/etc/kismet/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_client $(1)/usr/bin/ endef define Package/kismet-drone/install - install -d -m0755 $(1)/etc/kismet/ - install -m0644 ./files/kismet_drone.conf $(1)/etc/kismet/ - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/kismet_drone $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/etc/kismet/ + $(INSTALL_DATA) ./files/kismet_drone.conf $(1)/etc/kismet/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_drone $(1)/usr/bin/ endef define Package/kismet-server/install - install -d -m0755 $(1)/etc/kismet/ - install -m0644 ./files/ap_manuf $(1)/etc/kismet/ - install -m0644 ./files/client_manuf $(1)/etc/kismet/ - install -m0644 ./files/kismet.conf $(1)/etc/kismet/ - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/kismet_server $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/etc/kismet/ + $(INSTALL_DATA) ./files/ap_manuf $(1)/etc/kismet/ + $(INSTALL_DATA) ./files/client_manuf $(1)/etc/kismet/ + $(INSTALL_DATA) ./files/kismet.conf $(1)/etc/kismet/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_server $(1)/usr/bin/ endef $(eval $(call BuildPackage,kismet-client)) diff --git a/net/knock/Makefile b/net/knock/Makefile index e3d6b8e10..0f9a04477 100644 --- a/net/knock/Makefile +++ b/net/knock/Makefile @@ -75,14 +75,14 @@ define Build/Compile endef define Package/knock/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/knock $(1)/usr/bin/ endef define Package/kockd/install - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc install -m0600 $(PKG_INSTALL_DIR)/etc/knockd.conf $(1)/etc/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/knockd $(1)/usr/sbin/ endef diff --git a/net/l2tpd/Makefile b/net/l2tpd/Makefile index 0ed5a898d..544791a63 100644 --- a/net/l2tpd/Makefile +++ b/net/l2tpd/Makefile @@ -47,14 +47,14 @@ define Build/Compile endef define Package/l2tpd/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/l2tpd - install -m0644 ./files/l2tpd.conf $(1)/etc/l2tpd/ - install -d -m0755 $(1)/etc/ppp - install -m0644 ./files/options.l2tpd $(1)/etc/ppp/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/l2tpd.init $(1)/etc/init.d/l2tpd + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc/l2tpd + $(INSTALL_DATA) ./files/l2tpd.conf $(1)/etc/l2tpd/ + $(INSTALL_DIR) $(1)/etc/ppp + $(INSTALL_DATA) ./files/options.l2tpd $(1)/etc/ppp/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/l2tpd.init $(1)/etc/init.d/l2tpd endef $(eval $(call BuildPackage,l2tpd)) diff --git a/net/l2tpns/Makefile b/net/l2tpns/Makefile index fd44dab90..13d508fd5 100644 --- a/net/l2tpns/Makefile +++ b/net/l2tpns/Makefile @@ -52,11 +52,11 @@ define Build/Compile endef define Package/l2tpns/install - install -d -m0755 $(1)/etc/l2tpns + $(INSTALL_DIR) $(1)/etc/l2tpns $(CP) $(PKG_INSTALL_DIR)/etc/l2tpns/* $(1)/etc/l2tpns/ - install -d -m0755 $(1)/usr/lib/l2tpns + $(INSTALL_DIR) $(1)/usr/lib/l2tpns $(CP) $(PKG_INSTALL_DIR)/usr/lib/l2tpns/* $(1)/usr/lib/l2tpns/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ endef diff --git a/net/lft/Makefile b/net/lft/Makefile index 2142d2ea5..2ec032460 100644 --- a/net/lft/Makefile +++ b/net/lft/Makefile @@ -40,8 +40,8 @@ define Build/Compile endef define Package/lft/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/lft $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lft $(1)/usr/sbin/ endef $(eval $(call BuildPackage,lft)) diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile index e352fbeee..54dd72e5f 100644 --- a/net/lighttpd/Makefile +++ b/net/lighttpd/Makefile @@ -188,23 +188,23 @@ define Build/Compile endef define Package/lighttpd/install - install -m0755 -d $(1)/etc - install -m0644 ./files/lighttpd.conf $(1)/etc/ - install -m0755 -d $(1)/etc/default - install -m0644 ./files/lighttpd.default $(1)/etc/default/lighttpd - install -m0755 -d $(1)/etc/init.d - install -m0755 ./files/lighttpd.init $(1)/etc/init.d/lighttpd - install -m0755 -d $(1)/usr/lib/lighttpd + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/lighttpd.conf $(1)/etc/ + $(INSTALL_DIR) $(1)/etc/default + $(INSTALL_DATA) ./files/lighttpd.default $(1)/etc/default/lighttpd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/lighttpd.init $(1)/etc/init.d/lighttpd + $(INSTALL_DIR) $(1)/usr/lib/lighttpd for m in dirlisting indexfile staticfile; do \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lighttpd/mod_$$$${m}.so $(1)/usr/lib/lighttpd/ ; \ done - install -m0755 -d $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/lighttpd $(1)/usr/sbin/ endef define BuildPlugin define Package/$(1)/install - [ -z "$(2)" ] || install -d -m0755 $$(1)/usr/lib/lighttpd + [ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/lighttpd for m in $(2); do \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lighttpd/mod_$$$$$$$${m}.so $$(1)/usr/lib/lighttpd/ ; \ done diff --git a/net/maradns/Makefile b/net/maradns/Makefile index 989bbd90d..023ba86e3 100644 --- a/net/maradns/Makefile +++ b/net/maradns/Makefile @@ -59,13 +59,13 @@ define Build/Compile endef define Package/maradns/install - install -d -m0755 $(1)/etc - install -m0644 ./files/mararc $(1)/etc/mararc - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/maradns.init $(1)/etc/init.d/maradns - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/mararc $(1)/etc/mararc + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/maradns.init $(1)/etc/init.d/maradns + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/{askmara,getzone,fetchzone,duende} $(1)/usr/bin/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/{maradns,zoneserver} $(1)/usr/sbin/ endef diff --git a/net/matrixtunnel/Makefile b/net/matrixtunnel/Makefile index 656c82477..107f019a3 100644 --- a/net/matrixtunnel/Makefile +++ b/net/matrixtunnel/Makefile @@ -48,7 +48,7 @@ define Build/Compile endef define Package/matrixtunnel/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/matrixtunnel $(1)/usr/bin/ endef diff --git a/net/miau/Makefile b/net/miau/Makefile index 97437b8b2..78b84a605 100644 --- a/net/miau/Makefile +++ b/net/miau/Makefile @@ -51,14 +51,14 @@ define Build/Compile endef define Package/miau/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/ - install -d -m0755 $(1)/etc/init.d - install -d -m0755 $(1)/etc/default - install -d -m0755 $(1)/etc/miau - install -m0755 ./files/miau.init $(1)/etc/init.d/miau - install -m0644 ./files/miau $(1)/etc/default/miau - install -m0644 ./files/miaurc $(1)/etc/miau/miaurc + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_DIR) $(1)/etc/default + $(INSTALL_DIR) $(1)/etc/miau + $(INSTALL_BIN) ./files/miau.init $(1)/etc/init.d/miau + $(INSTALL_DATA) ./files/miau $(1)/etc/default/miau + $(INSTALL_DATA) ./files/miaurc $(1)/etc/miau/miaurc endef $(eval $(call BuildPackage,miau)) diff --git a/net/miax/Makefile b/net/miax/Makefile index cbaa9b9b7..f09daeb3e 100644 --- a/net/miax/Makefile +++ b/net/miax/Makefile @@ -43,8 +43,8 @@ define Build/Compile endef define Package/miax/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/miax $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/miax $(1)/usr/bin/ endef $(eval $(call BuildPackage,miax)) diff --git a/net/mini_httpd/Makefile b/net/mini_httpd/Makefile index 9b3243ebb..016484bcb 100644 --- a/net/mini_httpd/Makefile +++ b/net/mini_httpd/Makefile @@ -127,43 +127,43 @@ define Build/Compile endef define Package/mini-httpd/install - install -d -m0755 $(1)/etc - install -m0644 ./files/mini_httpd.conf $(1)/etc/mini_httpd.conf - install -d -m0755 $(1)/etc/default - install -m0644 ./files/mini_httpd.default $(1)/etc/default/mini_httpd - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/mini_httpd.init $(1)/etc/init.d/mini_httpd - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/mini_httpd $(1)/usr/sbin/mini_httpd + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/mini_httpd.conf $(1)/etc/mini_httpd.conf + $(INSTALL_DIR) $(1)/etc/default + $(INSTALL_DATA) ./files/mini_httpd.default $(1)/etc/default/mini_httpd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/mini_httpd.init $(1)/etc/init.d/mini_httpd + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/mini_httpd $(1)/usr/sbin/mini_httpd endef define Package/mini-httpd-htpasswd/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/htpasswd $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/htpasswd $(1)/usr/sbin/ endef define Package/mini-httpd-matrixssl/install - install -d -m0755 $(1)/etc - install -m0644 ./files/mini_httpd-ssl.conf $(1)/etc/mini_httpd.conf + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/mini_httpd-ssl.conf $(1)/etc/mini_httpd.conf install -m0600 ./files/mini_httpd.pem $(1)/etc/mini_httpd.pem - install -d -m0755 $(1)/etc/default - install -m0644 ./files/mini_httpd.default $(1)/etc/default/mini_httpd - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/mini_httpd.init $(1)/etc/init.d/mini_httpd - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/mini_httpd-matrixssl $(1)/usr/sbin/mini_httpd + $(INSTALL_DIR) $(1)/etc/default + $(INSTALL_DATA) ./files/mini_httpd.default $(1)/etc/default/mini_httpd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/mini_httpd.init $(1)/etc/init.d/mini_httpd + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/mini_httpd-matrixssl $(1)/usr/sbin/mini_httpd endef define Package/mini-httpd-openssl/install - install -d -m0755 $(1)/etc - install -m0644 ./files/mini_httpd-ssl.conf $(1)/etc/mini_httpd.conf + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/mini_httpd-ssl.conf $(1)/etc/mini_httpd.conf install -m0600 ./files/mini_httpd.pem $(1)/etc/mini_httpd.pem - install -d -m0755 $(1)/etc/default - install -m0644 ./files/mini_httpd.default $(1)/etc/default/mini_httpd - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/mini_httpd.init $(1)/etc/init.d/mini_httpd - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/mini_httpd-openssl $(1)/usr/sbin/mini_httpd + $(INSTALL_DIR) $(1)/etc/default + $(INSTALL_DATA) ./files/mini_httpd.default $(1)/etc/default/mini_httpd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/mini_httpd.init $(1)/etc/init.d/mini_httpd + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/mini_httpd-openssl $(1)/usr/sbin/mini_httpd endef $(eval $(call BuildPackage,mini-httpd)) diff --git a/net/mini_sendmail/Makefile b/net/mini_sendmail/Makefile index 402d957ce..5ad7d4c2f 100644 --- a/net/mini_sendmail/Makefile +++ b/net/mini_sendmail/Makefile @@ -41,8 +41,8 @@ define Build/Compile endef define Package/mini-sendmail/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/mini_sendmail $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/mini_sendmail $(1)/usr/sbin/ ln -sf mini_sendmail $(1)/usr/sbin/sendmail endef diff --git a/net/miredo/Makefile b/net/miredo/Makefile index 680253147..4456f7798 100644 --- a/net/miredo/Makefile +++ b/net/miredo/Makefile @@ -78,20 +78,20 @@ define Build/Compile endef define Package/miredo-server/install - install -d -m0755 $(1)/etc/ + $(INSTALL_DIR) $(1)/etc/ $(CP) $(PKG_INSTALL_DIR)/etc/miredo-server.conf-dist $(1)/etc/miredo-server.conf - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/miredo-server.init $(1)/etc/init.d/miredo-server - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/miredo-server.init $(1)/etc/init.d/miredo-server + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/miredo-server $(1)/usr/sbin/ endef define Package/miredo-client/install - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/miredo.conf-dist $(1)/etc/miredo.conf - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/miredo.init $(1)/etc/init.d/miredo - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/miredo.init $(1)/etc/init.d/miredo + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/miredo $(1)/usr/sbin/ endef diff --git a/net/mtr/Makefile b/net/mtr/Makefile index cfd7f4659..c5547c639 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -63,7 +63,7 @@ define Build/Compile endef define Package/mtr/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mtr $(1)/usr/sbin/ endef diff --git a/net/netperf/Makefile b/net/netperf/Makefile index 9ca3a1ecc..82f176df5 100644 --- a/net/netperf/Makefile +++ b/net/netperf/Makefile @@ -39,11 +39,11 @@ define Build/Compile endef define Package/netperf/install - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/netserver.init $(1)/etc/init.d/netserver - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/netperf $(1)/usr/bin/ - install -m0755 $(PKG_BUILD_DIR)/netserver $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/netserver.init $(1)/etc/init.d/netserver + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/netperf $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/netserver $(1)/usr/bin/ endef $(eval $(call BuildPackage,netperf)) diff --git a/net/netstat-nat/Makefile b/net/netstat-nat/Makefile index 716796f49..9b0722014 100644 --- a/net/netstat-nat/Makefile +++ b/net/netstat-nat/Makefile @@ -44,7 +44,7 @@ define Build/Compile endef define Package/netstat-nat/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/netstat-nat $(1)/usr/bin/ endef diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile index 29cf6e6ed..e5c125d5c 100644 --- a/net/nfs-kernel-server/Makefile +++ b/net/nfs-kernel-server/Makefile @@ -55,20 +55,20 @@ define Build/Compile endef define Package/nfs-kernel-server/install - install -d -m755 $(1)/etc/init.d $(1)/usr/sbin - install -m0644 ./files/nfsd.exports $(1)/etc/exports - install -m0755 ./files/nfsd.init $(1)/etc/init.d/nfsd - install -m0755 $(PKG_BUILD_DIR)/utils/lockd/lockd $(1)/usr/sbin/rpc.lockd - install -m0755 $(PKG_BUILD_DIR)/utils/statd/statd $(1)/usr/sbin/rpc.statd - install -m0755 $(PKG_BUILD_DIR)/utils/nfsd/nfsd $(1)/usr/sbin/rpc.nfsd - install -m0755 $(PKG_BUILD_DIR)/utils/mountd/mountd $(1)/usr/sbin/rpc.mountd - install -m0755 $(PKG_BUILD_DIR)/utils/exportfs/exportfs $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/sbin + $(INSTALL_DATA) ./files/nfsd.exports $(1)/etc/exports + $(INSTALL_BIN) ./files/nfsd.init $(1)/etc/init.d/nfsd + $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/lockd/lockd $(1)/usr/sbin/rpc.lockd + $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/statd/statd $(1)/usr/sbin/rpc.statd + $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/nfsd/nfsd $(1)/usr/sbin/rpc.nfsd + $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/mountd/mountd $(1)/usr/sbin/rpc.mountd + $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/exportfs/exportfs $(1)/usr/sbin/ endef define Package/nfs-kernel-server-utils/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/utils/showmount/showmount $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/utils/nfsstat/nfsstat $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/showmount/showmount $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/nfsstat/nfsstat $(1)/usr/sbin endef $(eval $(call BuildPackage,nfs-kernel-server)) diff --git a/net/nfs-server/Makefile b/net/nfs-server/Makefile index c66aa373c..3bb1722c9 100644 --- a/net/nfs-server/Makefile +++ b/net/nfs-server/Makefile @@ -35,12 +35,12 @@ define Build/Compile endef define Package/nfs-server/install - install -d -m0755 $(1)/etc - install -m0644 ./files/nfsd.exports $(1)/etc/exports - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/nfsd.init $(1)/etc/init.d/nfsd - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/rpc.* $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/nfsd.exports $(1)/etc/exports + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/nfsd.init $(1)/etc/init.d/nfsd + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/rpc.* $(1)/usr/sbin/ endef $(eval $(call BuildPackage,nfs-server)) diff --git a/net/nmap/Makefile b/net/nmap/Makefile index 9eacdcbc0..251ba2b46 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -53,9 +53,9 @@ define Build/Compile endef define Package/nmap/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/ - install -d -m0755 $(1)/usr/share/nmap + $(INSTALL_DIR) $(1)/usr/share/nmap for file in mac-prefixes os-fingerprints protocols rpc service-probes services; do \ $(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/nmap-$$$$file $(1)/usr/share/nmap/ ; \ done diff --git a/net/nocatsplash/Makefile b/net/nocatsplash/Makefile index 051132dd9..d147681b9 100644 --- a/net/nocatsplash/Makefile +++ b/net/nocatsplash/Makefile @@ -56,7 +56,7 @@ define Build/Compile endef define Package/nocatsplash/install - install -d -m0755 $(1) + $(INSTALL_DIR) $(1) $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef diff --git a/net/nsca/Makefile b/net/nsca/Makefile index b2ea2bf7b..59736ecb8 100644 --- a/net/nsca/Makefile +++ b/net/nsca/Makefile @@ -47,10 +47,10 @@ define Build/Compile endef define Package/send-nsca/install - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc install -m0600 $(PKG_BUILD_DIR)/sample-config/send_nsca.cfg $(1)/etc/ - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/src/send_nsca $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/send_nsca $(1)/usr/sbin/ endef $(eval $(call BuildPackage,send-nsca)) diff --git a/net/ntpclient/Makefile b/net/ntpclient/Makefile index 1ba6adbd2..c1bae5569 100644 --- a/net/ntpclient/Makefile +++ b/net/ntpclient/Makefile @@ -35,12 +35,12 @@ define Build/Compile endef define Package/ntpclient/install - install -d -m0755 $(1)/etc/hotplug.d/iface - install -m0755 ./files/ntpclient.init $(1)/etc/hotplug.d/iface/10-ntpclient - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/ntpclient $(1)/usr/sbin/ - install -m0755 $(PKG_BUILD_DIR)/adjtimex $(1)/usr/sbin/ - install -m0755 $(PKG_BUILD_DIR)/rate.awk $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc/hotplug.d/iface + $(INSTALL_BIN) ./files/ntpclient.init $(1)/etc/hotplug.d/iface/10-ntpclient + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ntpclient $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/adjtimex $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/rate.awk $(1)/usr/sbin/ endef $(eval $(call BuildPackage,ntpclient)) diff --git a/net/oidentd/Makefile b/net/oidentd/Makefile index 45bf9b4e6..5aa4ae88a 100644 --- a/net/oidentd/Makefile +++ b/net/oidentd/Makefile @@ -37,9 +37,9 @@ define Build/Compile endef define Package/oidentd/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/init.d + $(INSTALL_DIR) $(1)/etc/init.d $(CP) ./files/oidentd.init $(1)/etc/init.d/oidentd endef diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile index ea857700b..4072e730b 100644 --- a/net/olsrd/Makefile +++ b/net/olsrd/Makefile @@ -104,49 +104,49 @@ define Build/Compile endef define Package/olsrd/install - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/olsrd.conf $(1)/etc/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/olsrd $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/olsrd.init $(1)/etc/init.d/olsrd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/olsrd.init $(1)/etc/init.d/olsrd endef define Package/olsrd-mod-dot-draw/install - install -d -m0755 $(1)/usr/lib - install -m0755 $(PKG_INSTALL_DIR)/usr/lib/olsrd_dot_draw.so.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_dot_draw.so.* $(1)/usr/lib/ endef define Package/olsrd-mod-dyn-gw/install - install -d -m0755 $(1)/usr/lib - install -m0755 $(PKG_INSTALL_DIR)/usr/lib/olsrd_dyn_gw.so.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_dyn_gw.so.* $(1)/usr/lib/ endef define Package/olsrd-mod-httpinfo/install - install -d -m0755 $(1)/usr/lib - install -m0755 $(PKG_INSTALL_DIR)/usr/lib/olsrd_httpinfo.so.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_httpinfo.so.* $(1)/usr/lib/ endef define Package/olsrd-mod-nameservice/install - install -d -m0755 $(1)/usr/lib - install -m0755 $(PKG_INSTALL_DIR)/usr/lib/olsrd_nameservice.so.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_nameservice.so.* $(1)/usr/lib/ endef define Package/olsrd-mod-power/install - install -d -m0755 $(1)/usr/lib - install -m0755 $(PKG_INSTALL_DIR)/usr/lib/olsrd_power.so.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_power.so.* $(1)/usr/lib/ endef define Package/olsrd-mod-secure/install - install -d -m0755 $(1)/etc/olsrd.d + $(INSTALL_DIR) $(1)/etc/olsrd.d $(CP) ./files/olsrd_secure_key $(1)/etc/olsrd.d/ - install -d -m0755 $(1)/usr/lib - install -m0755 $(PKG_INSTALL_DIR)/usr/lib/olsrd_secure.so.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_secure.so.* $(1)/usr/lib/ endef define Package/olsrd-mod-tas/install - install -d -m0755 $(1)/usr/lib - install -m0755 $(PKG_INSTALL_DIR)/usr/lib/olsrd_tas.so.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_tas.so.* $(1)/usr/lib/ endef diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile index 12d565801..58e2fb773 100644 --- a/net/openntpd/Makefile +++ b/net/openntpd/Makefile @@ -88,14 +88,14 @@ define Build/Compile endef define Package/openntpd/install - install -d -m0755 $(1)/usr/sbin/ - install -m0755 $(PKG_BUILD_DIR)/ntpd $(1)/usr/sbin/ - install -d -m0755 $(1)/etc - install -m0644 ./files/ntpd.conf $(1)/etc/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/ntpd.init $(1)/etc/init.d/ntpd - install -d -m0755 $(1)/etc/hotplug.d/iface - install -m0755 ./files/ntpd.hotplug $(1)/etc/hotplug.d/iface/20-ntpd + $(INSTALL_DIR) $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ntpd $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/ntpd.conf $(1)/etc/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/ntpd.init $(1)/etc/init.d/ntpd + $(INSTALL_DIR) $(1)/etc/hotplug.d/iface + $(INSTALL_BIN) ./files/ntpd.hotplug $(1)/etc/hotplug.d/iface/20-ntpd endef $(eval $(call BuildPackage,openntpd)) diff --git a/net/openser/Makefile b/net/openser/Makefile index 696e9e692..61e1ce253 100644 --- a/net/openser/Makefile +++ b/net/openser/Makefile @@ -275,7 +275,7 @@ endef define BuildPlugin define Package/$(1)/install - [ -z "$(2)" ] || install -d -m0755 $$(1)/usr/lib/openser/modules/ + [ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/openser/modules/ $(CP) $(PKG_BUILD_DIR)/modules/$(2)/$(2).so \ $$(1)/usr/lib/openser/modules/ ; endef diff --git a/net/openssh/Makefile b/net/openssh/Makefile index ae93ff581..bfd3b6543 100644 --- a/net/openssh/Makefile +++ b/net/openssh/Makefile @@ -136,42 +136,42 @@ define Build/Compile endef define Package/openssh-client/install - install -m0755 -d $(1)/etc/ssh + $(INSTALL_DIR) $(1)/etc/ssh chmod 0700 $(1)/etc/ssh $(CP) $(PKG_INSTALL_DIR)/etc/ssh/ssh_config $(1)/etc/ssh/ - install -m0755 -d $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/scp $(1)/usr/bin/ endef define Package/openssh-client-utils/install - install -m0755 -d $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-add $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-agent $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-keyscan $(1)/usr/bin/ endef define Package/openssh-server/install - install -m0755 -d $(1)/etc/ssh + $(INSTALL_DIR) $(1)/etc/ssh chmod 0700 $(1)/etc/ssh $(CP) $(PKG_INSTALL_DIR)/etc/ssh/sshd_config $(1)/etc/ssh/ - install -m0755 -d $(1)/etc/init.d - install -m0755 ./files/sshd.init $(1)/etc/init.d/sshd - install -m0755 -d $(1)/usr/bin + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/sshd.init $(1)/etc/init.d/sshd + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(1)/usr/bin/ - install -m0755 -d $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/sshd $(1)/usr/sbin/ endef define Package/openssh-sftp-client/install - install -m0755 -d $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/sftp $(1)/usr/bin/ endef define Package/openssh-sftp-server/install - install -m0755 -d $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/sftp-server $(1)/usr/lib/ - install -m0755 -d $(1)/usr/libexec + $(INSTALL_DIR) $(1)/usr/libexec ln -sf ../lib/sftp-server $(1)/usr/libexec/sftp-server endef diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index 05cedaf9c..fc8b81f8a 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -56,14 +56,14 @@ define Build/Compile endef define Package/openvpn/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/openvpn $(1)/usr/sbin/ endef define Package/openvpn-easy-rsa/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/easy-rsa/2.0/{build-*,clean-all,inherit-inter,list-crl,pkitool,revoke-full,sign-req} $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/easy-rsa + $(INSTALL_DIR) $(1)/etc/easy-rsa install -m 0644 $(PKG_BUILD_DIR)/easy-rsa/2.0/openssl.cnf $(1)/etc/easy-rsa/openssl.cnf install -m 0644 $(PKG_BUILD_DIR)/easy-rsa/2.0/vars $(1)/etc/easy-rsa/vars endef diff --git a/net/p910nd/Makefile b/net/p910nd/Makefile index c1bce001c..d3acf0d0a 100644 --- a/net/p910nd/Makefile +++ b/net/p910nd/Makefile @@ -50,12 +50,12 @@ define Build/Compile endef define Package/p910nd/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/p910nd $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/default - install -m0644 ./files/p910nd.default $(1)/etc/default/p910nd - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/p910nd.init $(1)/etc/init.d/p910nd + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/p910nd $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc/default + $(INSTALL_DATA) ./files/p910nd.default $(1)/etc/default/p910nd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/p910nd.init $(1)/etc/init.d/p910nd endef $(eval $(call BuildPackage,p910nd)) diff --git a/net/parprouted/Makefile b/net/parprouted/Makefile index 7c39707f9..f669e27a4 100644 --- a/net/parprouted/Makefile +++ b/net/parprouted/Makefile @@ -43,12 +43,12 @@ define Build/Compile endef define Package/parprouted/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/parprouted $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/default - install -m0755 ./files/parprouted.default $(1)/etc/default/parprouted - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/parprouted.init $(1)/etc/init.d/parprouted + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/parprouted $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc/default + $(INSTALL_BIN) ./files/parprouted.default $(1)/etc/default/parprouted + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/parprouted.init $(1)/etc/init.d/parprouted endef $(eval $(call BuildPackage,parprouted)) diff --git a/net/peerguardian/Makefile b/net/peerguardian/Makefile index 243e07eaa..d871052c7 100644 --- a/net/peerguardian/Makefile +++ b/net/peerguardian/Makefile @@ -56,14 +56,14 @@ define Build/Compile endef define Package/peerguardian/install - install -d -m0755 $(1)/etc - install -m0644 $(PKG_BUILD_DIR)/PG.conf $(1)/etc/ - install -m0644 $(PKG_BUILD_DIR)/p2p.p2b.p2p $(1)/etc/ - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/peerguardnf $(1)/usr/sbin/ - install -m0755 $(PKG_BUILD_DIR)/pgtext $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/init.d - install -m0644 ./files/peerguardian.init $(1)/etc/init.d/peerguardian + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/PG.conf $(1)/etc/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/p2p.p2b.p2p $(1)/etc/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/peerguardnf $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/pgtext $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_DATA) ./files/peerguardian.init $(1)/etc/init.d/peerguardian endef $(eval $(call BuildPackage,peerguardian)) diff --git a/net/pmacct/Makefile b/net/pmacct/Makefile index 57509cbe0..7b5398dfc 100644 --- a/net/pmacct/Makefile +++ b/net/pmacct/Makefile @@ -137,14 +137,14 @@ define Package/$(1)/conffiles endef define Package/$(1)/install - install -d -m0755 $$(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/$(2) $$(1)/usr/sbin/$(3) - install -d -m0755 $$(1)/etc - install -m0644 ./files/$(3).conf $$(1)/etc/ - install -d -m0755 $$(1)/etc/default - install -m0644 ./files/$(3).default $$(1)/etc/default/$(3) - install -d -m0755 $$(1)/etc/init.d - install -m0755 ./files/$(3).init $$(1)/etc/init.d/$(3) + $(INSTALL_DIR) $$(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(2) $$(1)/usr/sbin/$(3) + $(INSTALL_DIR) $$(1)/etc + $(INSTALL_DATA) ./files/$(3).conf $$(1)/etc/ + $(INSTALL_DIR) $$(1)/etc/default + $(INSTALL_DATA) ./files/$(3).default $$(1)/etc/default/$(3) + $(INSTALL_DIR) $$(1)/etc/init.d + $(INSTALL_BIN) ./files/$(3).init $$(1)/etc/init.d/$(3) endef endef @@ -192,7 +192,7 @@ define Build/Compile endef define Package/pmacct-client/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/src/pmacct $(1)/usr/sbin/ endef diff --git a/net/portmap/Makefile b/net/portmap/Makefile index cd6671d2e..a86aaa456 100644 --- a/net/portmap/Makefile +++ b/net/portmap/Makefile @@ -38,10 +38,10 @@ define Build/Compile endef define Package/portmap/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/portmap $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/portmap.init $(1)/etc/init.d/portmap + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/portmap $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/portmap.init $(1)/etc/init.d/portmap endef $(eval $(call BuildPackage,portmap)) diff --git a/net/portsentry/Makefile b/net/portsentry/Makefile index 66ac1ff8b..e1f77d6f4 100644 --- a/net/portsentry/Makefile +++ b/net/portsentry/Makefile @@ -40,10 +40,10 @@ define Build/Compile endef define Package/portsentry/install - install -d -m0755 $(1)/etc - install -m0644 $(PKG_BUILD_DIR)/$(PKG_NAME).conf $(1)/etc/ - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_NAME).conf $(1)/etc/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ endef $(eval $(call BuildPackage,portsentry)) diff --git a/net/pptpd/Makefile b/net/pptpd/Makefile index dc5792175..88273384e 100644 --- a/net/pptpd/Makefile +++ b/net/pptpd/Makefile @@ -46,17 +46,17 @@ define Build/Compile endef define Package/pptpd/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pptpd $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pptpctrl $(1)/usr/sbin/ - install -d -m0755 $(1)/usr/lib/pptpd + $(INSTALL_DIR) $(1)/usr/lib/pptpd $(CP) $(PKG_INSTALL_DIR)/usr/lib/pptpd/* $(1)/usr/lib/pptpd - install -d -m0755 $(1)/etc - install -m0644 ./files/pptpd.conf $(1)/etc/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/pptpd.init $(1)/etc/init.d/pptpd - install -d -m0755 $(1)/etc/ppp - install -m0644 ./files/options.pptpd $(1)/etc/ppp/ + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/pptpd.conf $(1)/etc/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/pptpd.init $(1)/etc/init.d/pptpd + $(INSTALL_DIR) $(1)/etc/ppp + $(INSTALL_DATA) ./files/options.pptpd $(1)/etc/ppp/ endef $(eval $(call BuildPackage,pptpd)) diff --git a/net/privoxy/Makefile b/net/privoxy/Makefile index 09103ef00..b4340b5b5 100644 --- a/net/privoxy/Makefile +++ b/net/privoxy/Makefile @@ -76,7 +76,7 @@ define Build/Compile endef define Package/privoxy/install - install -d -m0755 $(1)/usr/sbin $(1)/etc/privoxy + $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/privoxy $(CP) $(PKG_INSTALL_DIR)/usr/sbin/privoxy $(1)/usr/sbin/ endef diff --git a/net/psybnc/Makefile b/net/psybnc/Makefile index 761387f6e..badf102d6 100644 --- a/net/psybnc/Makefile +++ b/net/psybnc/Makefile @@ -44,13 +44,13 @@ define Build/Compile endef define Package/psybnc/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/psybnc.sh $(1)/usr/sbin/psybnc - install -d -m0755 $(1)/usr/share/psybnc - install -m0755 $(PKG_BUILD_DIR)/psybnc $(1)/usr/share/psybnc/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/psybnc.sh $(1)/usr/sbin/psybnc + $(INSTALL_DIR) $(1)/usr/share/psybnc + $(INSTALL_BIN) $(PKG_BUILD_DIR)/psybnc $(1)/usr/share/psybnc/ install -m0600 $(PKG_BUILD_DIR)/psybnc.conf $(1)/usr/share/psybnc/ - install -d -m0755 $(1)/usr/share/psybnc/lang - install -m0644 $(PKG_BUILD_DIR)/lang/english.lng $(1)/usr/share/psybnc/lang/ + $(INSTALL_DIR) $(1)/usr/share/psybnc/lang + $(INSTALL_DATA) $(PKG_BUILD_DIR)/lang/english.lng $(1)/usr/share/psybnc/lang/ ln -sf /tmp $(1)/usr/share/psybnc/log endef diff --git a/net/ptunnel/Makefile b/net/ptunnel/Makefile index 3c5e9cce4..1b8792733 100644 --- a/net/ptunnel/Makefile +++ b/net/ptunnel/Makefile @@ -44,7 +44,7 @@ define Build/Compile endef define Package/ptunnel/install - install -m0755 -d $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ptunnel $(1)/usr/sbin/ endef diff --git a/net/quagga/Makefile b/net/quagga/Makefile index e72fb685a..8fd770870 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -120,16 +120,16 @@ define Build/Compile endef define Package/quagga/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(1)/usr/sbin/ # avoid /etc being set to 0750 - install -d -m0755 $(1)/etc/quagga/ + $(INSTALL_DIR) $(1)/etc/quagga/ chmod 0750 $(1)/etc/quagga/ - install -d -m0755 $(1)/etc/init.d/ - install -m0755 ./files/quagga $(1)/usr/sbin/quagga.init - install -m0755 ./files/quagga.init $(1)/etc/init.d/quagga - install -d -m0755 $(1)/var/run/quagga + $(INSTALL_DIR) $(1)/etc/init.d/ + $(INSTALL_BIN) ./files/quagga $(1)/usr/sbin/quagga.init + $(INSTALL_BIN) ./files/quagga.init $(1)/etc/init.d/quagga + $(INSTALL_DIR) $(1)/var/run/quagga endef define Package/quagga/postinst @@ -181,49 +181,49 @@ fi endef define Package/quagga-bgpd/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(1)/usr/sbin/ endef define Package/quagga-isisd/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/isisd $(1)/usr/sbin endef define Package/quagga-ospfd/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libospf.so.* $(1)/usr/lib/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(1)/usr/sbin/ endef define Package/quagga-ospf6d/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(1)/usr/sbin/ endef define Package/quagga-ripd/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ripd $(1)/usr/sbin/ endef define Package/quagga-ripngd/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(1)/usr/sbin/ endef define Package/quagga-vtysh/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/vtysh $(1)/usr/bin/ endef define Package/quagga-libospf/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libospf.so.* $(1)/usr/lib/ endef define Package/quagga-libzebra/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libzebra.so.* $(1)/usr/lib endef diff --git a/net/raddump/Makefile b/net/raddump/Makefile index 2a9973fdb..7b33fc7eb 100644 --- a/net/raddump/Makefile +++ b/net/raddump/Makefile @@ -44,7 +44,7 @@ define Build/Compile endef define Package/raddump/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/raddump $(1)/usr/bin/ endef diff --git a/net/radvd/Makefile b/net/radvd/Makefile index 2ee47a20d..b7f3c0bee 100644 --- a/net/radvd/Makefile +++ b/net/radvd/Makefile @@ -76,13 +76,13 @@ define Build/Compile endef define Package/radvd/install - install -d -m0755 $(1)/etc - install -m0644 ./files/radvd.conf $(1)/etc/radvd.conf - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/radvd.init $(1)/etc/init.d/radvd - install -d -m0755 $(1)/usr/sbin - install -m 755 $(PKG_INSTALL_DIR)/usr/sbin/radvd $(1)/usr/sbin/ - install -m 755 $(PKG_INSTALL_DIR)/usr/sbin/radvdump $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/radvd.conf $(1)/etc/radvd.conf + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/radvd.init $(1)/etc/init.d/radvd + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radvd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radvdump $(1)/usr/sbin/ endef $(eval $(call BuildPackage,radvd)) diff --git a/net/rarpd/Makefile b/net/rarpd/Makefile index acaca47f4..7f0eea477 100644 --- a/net/rarpd/Makefile +++ b/net/rarpd/Makefile @@ -52,11 +52,11 @@ define Build/Compile endef define Package/rarpd/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rarpd $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/default + $(INSTALL_DIR) $(1)/etc/default install -m644 ./files/rarpd.default $(1)/etc/default/rarpd - install -d -m0755 $(1)/etc/init.d + $(INSTALL_DIR) $(1)/etc/init.d install -m755 ./files/rarpd.init $(1)/etc/init.d/rarpd endef diff --git a/net/reaim/Makefile b/net/reaim/Makefile index 5bab88f67..e4c63ed61 100644 --- a/net/reaim/Makefile +++ b/net/reaim/Makefile @@ -40,10 +40,10 @@ define Build/Compile endef define Package/reaim/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/reaim $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/reaim.init $(1)/etc/init.d/reaim + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/reaim.init $(1)/etc/init.d/reaim endef $(eval $(call BuildPackage,reaim)) diff --git a/net/rp-l2tp/Makefile b/net/rp-l2tp/Makefile index d6ee87f2a..951cc7b8f 100644 --- a/net/rp-l2tp/Makefile +++ b/net/rp-l2tp/Makefile @@ -59,24 +59,24 @@ define Build/Compile endef define Package/rp-l2tpd/install - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/l2tp.conf.example $(1)/etc/l2tp.conf - install -d -m0755 $(1)/usr/lib/l2tp - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/lib/l2tp + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/l2tpd $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/rp-l2tpd.init $(1)/etc/init.d/rp-l2tpd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/rp-l2tpd.init $(1)/etc/init.d/rp-l2tpd endef define Package/rp-l2tpd-mod-cmd/install - install -d -m0755 $(1)/usr/lib/l2tp + $(INSTALL_DIR) $(1)/usr/lib/l2tp $(CP) $(PKG_INSTALL_DIR)/usr/lib/l2tp/cmd.so $(1)/usr/lib/l2tp/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/l2tp-control $(1)/usr/sbin/ endef define Package/rp-l2tpd-mod-ppp/install - install -d -m0755 $(1)/usr/lib/l2tp + $(INSTALL_DIR) $(1)/usr/lib/l2tp $(CP) $(PKG_INSTALL_DIR)/usr/lib/l2tp/sync-pppd.so $(1)/usr/lib/l2tp/ endef diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile index a2bebb8c0..06e86e74e 100644 --- a/net/rp-pppoe/Makefile +++ b/net/rp-pppoe/Makefile @@ -61,37 +61,37 @@ define Build/Compile endef define Package/rp-pppoe-client/install - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/pppoe-client.init $(1)/etc/init.d/pppoe-client - install -d -m0755 $(1)/etc/ppp - install -m0644 $(PKG_INSTALL_DIR)/etc/pppoe.conf $(1)/etc/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/pppoe-client.init $(1)/etc/init.d/pppoe-client + $(INSTALL_DIR) $(1)/etc/ppp + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/pppoe.conf $(1)/etc/ + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/adsl-* $(1)/usr/sbin/ endef define Package/rp-pppoe-relay/install - install -d -m0755 $(1)/etc/default - install -m0755 ./files/pppoe-relay.default $(1)/etc/default/pppoe-relay - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/pppoe-relay.init $(1)/etc/init.d/pppoe-relay - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/etc/default + $(INSTALL_BIN) ./files/pppoe-relay.default $(1)/etc/default/pppoe-relay + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/pppoe-relay.init $(1)/etc/init.d/pppoe-relay + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-relay $(1)/usr/sbin/ endef define Package/rp-pppoe-server/install - install -d -m0755 $(1)/etc/default - install -m0755 ./files/pppoe-server.default $(1)/etc/default/pppoe-server - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/pppoe-server.init $(1)/etc/init.d/pppoe-server - install -d -m0755 $(1)/etc/ppp - install -m0644 $(PKG_INSTALL_DIR)/etc/ppp/pppoe-server-options $(1)/etc/ppp/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/etc/default + $(INSTALL_BIN) ./files/pppoe-server.default $(1)/etc/default/pppoe-server + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/pppoe-server.init $(1)/etc/init.d/pppoe-server + $(INSTALL_DIR) $(1)/etc/ppp + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/ppp/pppoe-server-options $(1)/etc/ppp/ + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-server $(1)/usr/sbin/ endef define Package/rp-pppoe-sniff/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-sniff $(1)/usr/sbin/ endef diff --git a/net/rrs/Makefile b/net/rrs/Makefile index 0bd2b54e9..bff464479 100644 --- a/net/rrs/Makefile +++ b/net/rrs/Makefile @@ -71,13 +71,13 @@ define Build/Compile endef define Package/rrs/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/rrs-ssl $(1)/usr/bin/rrs + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/rrs-ssl $(1)/usr/bin/rrs endef define Package/rrs-nossl/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/rrs-nossl $(1)/usr/bin/rrs + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/rrs-nossl $(1)/usr/bin/rrs endef $(eval $(call BuildPackage,rrs)) diff --git a/net/samba/Makefile b/net/samba/Makefile index 0f2218460..f10323cf1 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -167,25 +167,25 @@ define Build/Compile endef define Package/samba-server/install - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/samba.init $(1)/etc/init.d/samba - install -d -m0755 $(1)/etc/samba - install -m0644 ./files/smb.conf $(1)/etc/samba/smb.conf - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/source/bin/smbpasswd.shared $(1)/usr/bin/smbpasswd - install -d -m0755 $(1)/usr/lib - install -m0755 $(PKG_BUILD_DIR)/source/bin/libsmb.so $(1)/usr/lib/ - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/source/bin/nmbd.shared $(1)/usr/sbin/nmbd - install -m0755 $(PKG_BUILD_DIR)/source/bin/smbd.shared $(1)/usr/sbin/smbd - install -d -m0755 $(1)/usr/share/samba - install -m0644 $(PKG_INSTALL_DIR)/usr/share/samba/codepage.{437,850} $(1)/usr/share/samba/ - install -m0644 $(PKG_INSTALL_DIR)/usr/share/samba/unicode_map.{437,850} $(1)/usr/share/samba/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/samba.init $(1)/etc/init.d/samba + $(INSTALL_DIR) $(1)/etc/samba + $(INSTALL_DATA) ./files/smb.conf $(1)/etc/samba/smb.conf + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/smbpasswd.shared $(1)/usr/bin/smbpasswd + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/libsmb.so $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/nmbd.shared $(1)/usr/sbin/nmbd + $(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/smbd.shared $(1)/usr/sbin/smbd + $(INSTALL_DIR) $(1)/usr/share/samba + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/samba/codepage.{437,850} $(1)/usr/share/samba/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/samba/unicode_map.{437,850} $(1)/usr/share/samba/ endef define Package/samba-client/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_INSTALL_DIR)/usr/bin/smbclient $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/smbclient $(1)/usr/bin/ endef $(eval $(call BuildPackage,samba-server)) diff --git a/net/scanlogd/Makefile b/net/scanlogd/Makefile index 1491857bd..04c0c3a1c 100644 --- a/net/scanlogd/Makefile +++ b/net/scanlogd/Makefile @@ -56,10 +56,10 @@ define Build/Compile endef define Package/scanlogd/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/scanlogd.init $(1)/etc/init.d/scanlogd + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/scanlogd.init $(1)/etc/init.d/scanlogd endef $(eval $(call BuildPackage,scanlogd)) diff --git a/net/scdp/Makefile b/net/scdp/Makefile index edfce0cbc..4ffc56c18 100644 --- a/net/scdp/Makefile +++ b/net/scdp/Makefile @@ -50,7 +50,7 @@ define Build/Compile endef define Package/scdp/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/scdp $(1)/usr/bin/ endef diff --git a/net/ser2net/Makefile b/net/ser2net/Makefile index c7e0013ff..631af9a93 100644 --- a/net/ser2net/Makefile +++ b/net/ser2net/Makefile @@ -47,9 +47,9 @@ define Build/Compile endef define Package/ser2net/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ser2net $(1)/usr/sbin/ - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_BUILD_DIR)/ser2net.conf $(1)/etc/ endef diff --git a/net/shat/Makefile b/net/shat/Makefile index 2d1deb6ed..679831e33 100644 --- a/net/shat/Makefile +++ b/net/shat/Makefile @@ -39,9 +39,9 @@ define Build/Compile endef define Package/shat/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/src/shatd $(1)/usr/sbin/ - install -m0755 $(PKG_BUILD_DIR)/src/shatc $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/shatd $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/shatc $(1)/usr/sbin/ endef $(eval $(call BuildPackage,shat)) diff --git a/net/sipp/Makefile b/net/sipp/Makefile index 4a99c2265..673c192e1 100644 --- a/net/sipp/Makefile +++ b/net/sipp/Makefile @@ -47,8 +47,8 @@ define Build/Compile endef define Package/sipp/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ endef $(eval $(call BuildPackage,sipp)) diff --git a/net/siproxd/Makefile b/net/siproxd/Makefile index d016071b0..d4caa129a 100644 --- a/net/siproxd/Makefile +++ b/net/siproxd/Makefile @@ -44,13 +44,13 @@ define Build/Compile endef define Package/siproxd/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/siproxd $(1)/usr/sbin/ - install -d -m0755 $(1)/etc - install -m0644 $(PKG_BUILD_DIR)/doc/siproxd.conf.example $(1)/etc/siproxd.conf + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/siproxd.conf.example $(1)/etc/siproxd.conf install -m0600 $(PKG_BUILD_DIR)/doc/siproxd_passwd.cfg $(1)/etc/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/siproxd.init $(1)/etc/init.d/siproxd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/siproxd.init $(1)/etc/init.d/siproxd endef $(eval $(call BuildPackage,siproxd)) diff --git a/net/sipsak/Makefile b/net/sipsak/Makefile index d0563d639..4c11e8405 100644 --- a/net/sipsak/Makefile +++ b/net/sipsak/Makefile @@ -44,7 +44,7 @@ define Build/Compile endef define Package/sipsak/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/sipsak $(1)/usr/bin/ endef diff --git a/net/slurm/Makefile b/net/slurm/Makefile index c9af3099d..1983104c7 100644 --- a/net/slurm/Makefile +++ b/net/slurm/Makefile @@ -59,7 +59,7 @@ define Build/Compile endef define Package/slurm/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/slurm $(1)/usr/bin/ endef diff --git a/net/snort-wireless/Makefile b/net/snort-wireless/Makefile index cf8bcf4d0..c1f001e4e 100644 --- a/net/snort-wireless/Makefile +++ b/net/snort-wireless/Makefile @@ -94,20 +94,20 @@ define Package/$(1)/conffiles endef define Package/$(1)/install - install -d -m0755 $$(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/snort-wireless-$(2) $$(1)/usr/sbin/snort - install -d -m0755 $$(1)/etc/snort - install -m0644 $(PKG_BUILD_DIR)/etc/snort.conf $$(1)/etc/snort/ - install -m0644 $(PKG_BUILD_DIR)/etc/classification.config $$(1)/etc/snort/ - install -m0644 $(PKG_BUILD_DIR)/etc/gen-msg.map $$(1)/etc/snort/ - install -m0644 $(PKG_BUILD_DIR)/etc/reference.config $$(1)/etc/snort/ - install -m0644 $(PKG_BUILD_DIR)/etc/sid-msg.map $$(1)/etc/snort/ - install -m0644 $(PKG_BUILD_DIR)/etc/threshold.conf $$(1)/etc/snort/ - install -m0644 $(PKG_BUILD_DIR)/etc/unicode.map $$(1)/etc/snort/ - install -d -m0755 $$(1)/etc/default - install -m0644 ./files/snort-wireless.default $$(1)/etc/default/snort - install -d -m0755 $$(1)/etc/init.d - install -m0755 ./files/snort-wireless.init $$(1)/etc/init.d/snort + $(INSTALL_DIR) $$(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/snort-wireless-$(2) $$(1)/usr/sbin/snort + $(INSTALL_DIR) $$(1)/etc/snort + $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/snort.conf $$(1)/etc/snort/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/classification.config $$(1)/etc/snort/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/gen-msg.map $$(1)/etc/snort/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/reference.config $$(1)/etc/snort/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/sid-msg.map $$(1)/etc/snort/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/threshold.conf $$(1)/etc/snort/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/unicode.map $$(1)/etc/snort/ + $(INSTALL_DIR) $$(1)/etc/default + $(INSTALL_DATA) ./files/snort-wireless.default $$(1)/etc/default/snort + $(INSTALL_DIR) $$(1)/etc/init.d + $(INSTALL_BIN) ./files/snort-wireless.init $$(1)/etc/init.d/snort endef endef diff --git a/net/snort/Makefile b/net/snort/Makefile index f482485d5..7dfc28b24 100644 --- a/net/snort/Makefile +++ b/net/snort/Makefile @@ -94,20 +94,20 @@ define Package/$(1)/conffiles endef define Package/$(1)/install - install -d -m0755 $$(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/snort-$(2) $$(1)/usr/sbin/snort - install -d -m0755 $$(1)/etc/snort - install -m0644 $(PKG_BUILD_DIR)/etc/snort.conf $$(1)/etc/snort/ - install -m0644 $(PKG_BUILD_DIR)/etc/classification.config $$(1)/etc/snort/ - install -m0644 $(PKG_BUILD_DIR)/etc/gen-msg.map $$(1)/etc/snort/ - install -m0644 $(PKG_BUILD_DIR)/etc/reference.config $$(1)/etc/snort/ - install -m0644 $(PKG_BUILD_DIR)/etc/sid-msg.map $$(1)/etc/snort/ - install -m0644 $(PKG_BUILD_DIR)/etc/threshold.conf $$(1)/etc/snort/ - install -m0644 $(PKG_BUILD_DIR)/etc/unicode.map $$(1)/etc/snort/ - install -d -m0755 $$(1)/etc/default - install -m0644 ./files/snort.default $$(1)/etc/default/snort - install -d -m0755 $$(1)/etc/init.d - install -m0755 ./files/snort.init $$(1)/etc/init.d/snort + $(INSTALL_DIR) $$(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/snort-$(2) $$(1)/usr/sbin/snort + $(INSTALL_DIR) $$(1)/etc/snort + $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/snort.conf $$(1)/etc/snort/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/classification.config $$(1)/etc/snort/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/gen-msg.map $$(1)/etc/snort/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/reference.config $$(1)/etc/snort/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/sid-msg.map $$(1)/etc/snort/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/threshold.conf $$(1)/etc/snort/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/unicode.map $$(1)/etc/snort/ + $(INSTALL_DIR) $$(1)/etc/default + $(INSTALL_DATA) ./files/snort.default $$(1)/etc/default/snort + $(INSTALL_DIR) $$(1)/etc/init.d + $(INSTALL_BIN) ./files/snort.init $$(1)/etc/init.d/snort endef endef diff --git a/net/socat/Makefile b/net/socat/Makefile index c818e2b14..552077fe7 100644 --- a/net/socat/Makefile +++ b/net/socat/Makefile @@ -54,7 +54,7 @@ define Build/Compile endef define Package/socat/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/socat $(1)/usr/bin/ endef diff --git a/net/squid/Makefile b/net/squid/Makefile index 4939e1fb2..4d0989f20 100644 --- a/net/squid/Makefile +++ b/net/squid/Makefile @@ -152,18 +152,18 @@ define Build/Compile endef define Package/squid/install - install -d -m0755 $(1)/etc/squid + $(INSTALL_DIR) $(1)/etc/squid $(CP) $(PKG_INSTALL_DIR)/etc/squid/mime.conf $(1)/etc/squid/ $(CP) $(PKG_INSTALL_DIR)/etc/squid/squid.conf $(1)/etc/squid/ - install -d -m0755 $(1)/usr/share/squid + $(INSTALL_DIR) $(1)/usr/share/squid $(CP) $(PKG_INSTALL_DIR)/usr/share/squid/* $(1)/usr/share/squid/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/squid $(1)/usr/sbin/ endef define BuildPlugin define Package/$(1)/install - install -d -m0755 $$(1)/usr/lib/squid + $(INSTALL_DIR) $$(1)/usr/lib/squid $(CP) $(PKG_INSTALL_DIR)/usr/lib/squid/$(2) $$(1)/usr/lib/squid/ endef diff --git a/net/srelay/Makefile b/net/srelay/Makefile index c680f7edc..689483dd7 100644 --- a/net/srelay/Makefile +++ b/net/srelay/Makefile @@ -43,12 +43,12 @@ define Build/Compile endef define Package/srelay/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/srelay $(1)/usr/bin/ - install -d -m0755 $(1)/etc - install -m0644 files/srelay.conf $(1)/etc/ - install -d -m0755 $(1)/etc/init.d - install -m0755 files/srelay.init $(1)/etc/init.d/srelay + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/srelay $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) files/srelay.conf $(1)/etc/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) files/srelay.init $(1)/etc/init.d/srelay endef $(eval $(call BuildPackage,srelay)) diff --git a/net/ssltunnel/Makefile b/net/ssltunnel/Makefile index 952844e16..508915852 100644 --- a/net/ssltunnel/Makefile +++ b/net/ssltunnel/Makefile @@ -45,12 +45,12 @@ define Build/Compile endef define Package/ssltunnel/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_INSTALL_DIR)/usr/bin/pppclient $(1)/usr/bin/ - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppwho $(1)/usr/sbin/ - install -d -m0755 $(1)/usr/lib - install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppserver $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pppclient $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pppwho $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/pppserver $(1)/usr/lib/ endef $(eval $(call BuildPackage,ssltunnel)) diff --git a/net/ssmtp/Makefile b/net/ssmtp/Makefile index c8e88cb39..6f0c6a40d 100644 --- a/net/ssmtp/Makefile +++ b/net/ssmtp/Makefile @@ -42,11 +42,11 @@ define Build/Compile endef define Package/ssmtp/install - install -d -m0755 $(1)/etc/ssmtp - install -m0644 $(PKG_BUILD_DIR)/ssmtp.conf $(1)/etc/ssmtp/ - install -m0644 $(PKG_BUILD_DIR)/revaliases $(1)/etc/ssmtp/ - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/ssmtp $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc/ssmtp + $(INSTALL_DATA) $(PKG_BUILD_DIR)/ssmtp.conf $(1)/etc/ssmtp/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/revaliases $(1)/etc/ssmtp/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ssmtp $(1)/usr/sbin/ ln -sf ssmtp $(1)/usr/sbin/sendmail endef diff --git a/net/stunnel/Makefile b/net/stunnel/Makefile index 78479eb79..0c53499ea 100644 --- a/net/stunnel/Makefile +++ b/net/stunnel/Makefile @@ -42,8 +42,8 @@ define Build/Compile endef define Package/stunnel/install - install -d -m0755 $(1)/usr/sbin $(1)/usr/lib $(1)/usr/stunnel - install -d -m0755 $(1)/etc/stunnel $(1)/etc/init.d + $(INSTALL_DIR) $(1)/usr/sbin $(1)/usr/lib $(1)/usr/stunnel + $(INSTALL_DIR) $(1)/etc/stunnel $(1)/etc/init.d $(CP) $(PKG_INSTALL_DIR)/usr/sbin/stunnel $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libstunnel.so $(1)/usr/sbin/ $(CP) ./files/stunnel.conf $(1)/etc/stunnel/stunnel.conf diff --git a/net/tcp_wrappers/Makefile b/net/tcp_wrappers/Makefile index e5b0d5a8d..3425fa886 100644 --- a/net/tcp_wrappers/Makefile +++ b/net/tcp_wrappers/Makefile @@ -60,7 +60,7 @@ define Build/UninstallDev endef define Package/libwrap/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/shared/libwrap.so.* $(1)/usr/lib/ endef diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile index a5dfb2698..c2afe0ad1 100644 --- a/net/tcpdump/Makefile +++ b/net/tcpdump/Makefile @@ -52,7 +52,7 @@ define Build/Compile endef define Package/tcpdump/install - install -m0755 -d $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tcpdump $(1)/usr/sbin/ endef diff --git a/net/tftp-hpa/Makefile b/net/tftp-hpa/Makefile index 72897bb51..e74f19b15 100644 --- a/net/tftp-hpa/Makefile +++ b/net/tftp-hpa/Makefile @@ -49,15 +49,15 @@ define Build/Compile endef define Package/tftp-hpa/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/tftp/tftp $(1)/usr/bin/tftp-hpa + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/tftp/tftp $(1)/usr/bin/tftp-hpa endef define Package/tftpd-hpa/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/tftpd/tftpd $(1)/usr/sbin/tftpd-hpa - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/tftpd-hpa.init $(1)/etc/init.d/tftpd-hpa + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/tftpd/tftpd $(1)/usr/sbin/tftpd-hpa + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/tftpd-hpa.init $(1)/etc/init.d/tftpd-hpa endef $(eval $(call BuildPackage,tftp-hpa)) diff --git a/net/tinc/Makefile b/net/tinc/Makefile index 0d29ca420..d05578033 100644 --- a/net/tinc/Makefile +++ b/net/tinc/Makefile @@ -47,7 +47,7 @@ define Build/Compile endef define Package/tinc/install - install -m0755 -d $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tincd $(1)/usr/sbin/ endef diff --git a/net/tinyproxy/Makefile b/net/tinyproxy/Makefile index ec798dfd1..a8b64f15a 100644 --- a/net/tinyproxy/Makefile +++ b/net/tinyproxy/Makefile @@ -47,13 +47,13 @@ define Build/Compile endef define Package/tinyproxy/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tinyproxy $(1)/usr/sbin/ - install -d -m0755 $(1)/usr/share/tinyproxy + $(INSTALL_DIR) $(1)/usr/share/tinyproxy $(CP) $(PKG_INSTALL_DIR)/usr/share/tinyproxy/*.html $(1)/usr/share/tinyproxy/ - install -d -m0755 $(1)/etc/tinyproxy + $(INSTALL_DIR) $(1)/etc/tinyproxy $(CP) $(PKG_INSTALL_DIR)/etc/tinyproxy/tinyproxy.conf $(1)/etc/tinyproxy/ - install -d -m0755 $(1)/etc/init.d + $(INSTALL_DIR) $(1)/etc/init.d $(CP) ./files/tinyproxy.init $(1)/etc/init.d/tinyproxy endef diff --git a/net/tmsnc/Makefile b/net/tmsnc/Makefile index a513c3ded..952aec12c 100644 --- a/net/tmsnc/Makefile +++ b/net/tmsnc/Makefile @@ -48,7 +48,7 @@ define Build/Compile endef define Package/tmsnc/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/tmsnc $(1)/usr/bin/ endef diff --git a/net/tor/Makefile b/net/tor/Makefile index d853b95c5..595b3c108 100644 --- a/net/tor/Makefile +++ b/net/tor/Makefile @@ -105,12 +105,12 @@ define Build/Compile endef define Package/tor/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/bin/tor $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/tor.init $(1)/etc/init.d/tor - install -d -m0755 $(1)/etc/tor - install -m0644 ./files/torrc $(1)/etc/tor/torrc + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/tor.init $(1)/etc/init.d/tor + $(INSTALL_DIR) $(1)/etc/tor + $(INSTALL_DATA) ./files/torrc $(1)/etc/tor/torrc endef $(eval $(call BuildPackage,tor)) diff --git a/net/ttcp/Makefile b/net/ttcp/Makefile index 9629eb187..002874225 100644 --- a/net/ttcp/Makefile +++ b/net/ttcp/Makefile @@ -29,8 +29,8 @@ define Build/Compile endef define Package/ttcp/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/ttcp $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ttcp $(1)/usr/bin/ endef $(eval $(call BuildPackage,ttcp)) diff --git a/net/udp-broadcast-relay/Makefile b/net/udp-broadcast-relay/Makefile index 2a45d4923..18c59412b 100644 --- a/net/udp-broadcast-relay/Makefile +++ b/net/udp-broadcast-relay/Makefile @@ -42,7 +42,7 @@ define Build/Compile endef define Package/udp-broadcast-relay/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ endef diff --git a/net/ulogd/Makefile b/net/ulogd/Makefile index 196ef025f..b1c8e3709 100644 --- a/net/ulogd/Makefile +++ b/net/ulogd/Makefile @@ -110,21 +110,21 @@ define Build/Compile endef define Package/ulogd/install - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/ulogd.conf $(1)/etc/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(1)/usr/sbin/ - install -d -m0755 $(1)/usr/lib/ulogd + $(INSTALL_DIR) $(1)/usr/lib/ulogd $(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_BASE.so $(1)/usr/lib/ulogd/ - install -d -m0755 $(1)/etc/default - install -m0644 ./files/ulogd.default $(1)/etc/default/ulogd - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/ulogd.init $(1)/etc/init.d/ulogd + $(INSTALL_DIR) $(1)/etc/default + $(INSTALL_DATA) ./files/ulogd.default $(1)/etc/default/ulogd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/ulogd.init $(1)/etc/init.d/ulogd endef define BuildPlugin define Package/$(1)/install - install -m0755 -d $$(1)/usr/lib/ulogd + $(INSTALL_DIR) $$(1)/usr/lib/ulogd for m in $(2); do \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_$$$$$$$${m}.so $$(1)/usr/lib/ulogd/ ; \ done diff --git a/net/uob-nomad/Makefile b/net/uob-nomad/Makefile index 8c5851639..9eb20b45e 100644 --- a/net/uob-nomad/Makefile +++ b/net/uob-nomad/Makefile @@ -46,7 +46,7 @@ $(call Build/Compile/Default,-C $(PKG_BUILD_DIR)/Client mipmn) endef define Package/uob-nomad/install - install -d -m0755 $(1)/usr/bin $(1)/usr/lib $(1)/etc/ + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib $(1)/etc/ $(CP) $(PKG_BUILD_DIR)/Agent/mipagent $(1)/usr/bin/ $(CP) $(PKG_BUILD_DIR)/Client/mipmn $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/conf/mip{agent,mn,mn-filters}.conf $(1)/etc/ diff --git a/net/updatedd/Makefile b/net/updatedd/Makefile index 79f220e1f..7c8f9ed1d 100644 --- a/net/updatedd/Makefile +++ b/net/updatedd/Makefile @@ -103,19 +103,19 @@ endef define BuildPlugin define Package/$(1)/install - install -d -m0755 $$(1)/usr/lib/updatedd - install -m0755 $(PKG_INSTALL_DIR)/usr/lib/updatedd/$(2).so $$(1)/usr/lib/updatedd/ + $(INSTALL_DIR) $$(1)/usr/lib/updatedd + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/updatedd/$(2).so $$(1)/usr/lib/updatedd/ endef $$(eval $$(call BuildPackage,$(1))) endef define Package/updatedd/install - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/ddns.init $(1)/etc/init.d/ddns - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/ddns.init $(1)/etc/init.d/ddns + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/updatedd $(1)/usr/bin/ - install -d -m0755 $(1)/usr/lib/updatedd + $(INSTALL_DIR) $(1)/usr/lib/updatedd endef $(eval $(call BuildPackage,updatedd)) diff --git a/net/vgp/Makefile b/net/vgp/Makefile index e75a169d8..943599495 100644 --- a/net/vgp/Makefile +++ b/net/vgp/Makefile @@ -44,7 +44,7 @@ define Build/Compile endef define Package/vgp/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/vgpd $(1)/usr/bin/ endef diff --git a/net/vnc-reflector/Makefile b/net/vnc-reflector/Makefile index 296e9b87d..07d164595 100644 --- a/net/vnc-reflector/Makefile +++ b/net/vnc-reflector/Makefile @@ -44,8 +44,8 @@ define Build/Compile endef define Package/vnc-reflector/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/vncreflector $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/vncreflector $(1)/usr/sbin/ endef $(eval $(call BuildPackage,vnc-reflector)) diff --git a/net/vncrepeater/Makefile b/net/vncrepeater/Makefile index 48bfbbf14..9c9748627 100644 --- a/net/vncrepeater/Makefile +++ b/net/vncrepeater/Makefile @@ -50,11 +50,11 @@ define Build/Compile endef define Package/vncrepeater/install - install -d -m0755 $(1)/usr/sbin $(1)/etc + $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc $(CP) $(PKG_BUILD_DIR)/repeater $(1)/usr/sbin/$(PKG_NAME) - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_BUILD_DIR)/uvncrepeater.ini $(1)/etc/vncrepeater.conf - install -d -m0755 $(1)/etc/init.d + $(INSTALL_DIR) $(1)/etc/init.d $(CP) $(PKG_BUILD_DIR)/S60vncrepeater $(1)/etc/init.d/ endef diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile index 7051b5be7..786bb5d9d 100644 --- a/net/vnstat/Makefile +++ b/net/vnstat/Makefile @@ -40,8 +40,8 @@ define Build/Compile endef define Package/vnstat/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/src/vnstat $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/vnstat $(1)/usr/bin/ endef $(eval $(call BuildPackage,vnstat)) diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile index b0bc21f76..2fac7e71f 100644 --- a/net/vpnc/Makefile +++ b/net/vpnc/Makefile @@ -47,13 +47,13 @@ define Build/Compile endef define Package/vpnc/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/vpnc \ $(PKG_INSTALL_DIR)/usr/sbin/vpnc-disconnect \ $(1)/usr/sbin/ install -d -m0700 $(1)/etc/vpnc install -m0600 $(PKG_INSTALL_DIR)/etc/vpnc/vpnc.conf $(1)/etc/vpnc/ - install -m0755 $(PKG_INSTALL_DIR)/etc/vpnc/vpnc-script $(1)/etc/vpnc/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/vpnc/vpnc-script $(1)/etc/vpnc/ endef $(eval $(call BuildPackage,vpnc)) diff --git a/net/vrrpd/Makefile b/net/vrrpd/Makefile index efada914b..e583b0b67 100644 --- a/net/vrrpd/Makefile +++ b/net/vrrpd/Makefile @@ -47,12 +47,12 @@ define Build/Compile endef define Package/vrrpd/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/vrrpd $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/default - install -m0644 ./files/vrrpd.default $(1)/etc/default/vrrpd - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/vrrpd.init $(1)/etc/init.d/vrrpd + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/vrrpd $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc/default + $(INSTALL_DATA) ./files/vrrpd.default $(1)/etc/default/vrrpd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/vrrpd.init $(1)/etc/init.d/vrrpd endef $(eval $(call BuildPackage,vrrpd)) diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile index 1a39a65dd..90a2b429b 100644 --- a/net/vsftpd/Makefile +++ b/net/vsftpd/Makefile @@ -47,12 +47,12 @@ define Build/Compile endef define Package/vsftpd/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/vsftpd $(1)/usr/sbin/ - install -d -m0755 $(1)/etc - install -m0644 ./files/vsftpd.conf $(1)/etc/vsftpd.conf - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/vsftpd.init $(1)/etc/init.d/vsftpd + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/vsftpd.conf $(1)/etc/vsftpd.conf + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/vsftpd.init $(1)/etc/init.d/vsftpd endef $(eval $(call BuildPackage,vsftpd)) diff --git a/net/vtun/Makefile b/net/vtun/Makefile index 8ba01531d..bf0f4ca0f 100644 --- a/net/vtun/Makefile +++ b/net/vtun/Makefile @@ -48,10 +48,10 @@ define Build/Compile endef define Package/vtun/install - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc install -m0600 $(PKG_BUILD_DIR)/vtund.conf $(1)/etc/ - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/vtund $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/vtund $(1)/usr/sbin/ endef $(eval $(call BuildPackage,vtun)) diff --git a/net/wccpd/Makefile b/net/wccpd/Makefile index 2c726a491..0dd8e0e49 100644 --- a/net/wccpd/Makefile +++ b/net/wccpd/Makefile @@ -45,7 +45,7 @@ define Build/Compile endef define Package/wccpd/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/wccpd $(1)/usr/sbin/ endef diff --git a/net/wdiag/Makefile b/net/wdiag/Makefile index 3c8c984af..b6743d170 100644 --- a/net/wdiag/Makefile +++ b/net/wdiag/Makefile @@ -36,7 +36,7 @@ define Build/Compile endef define Package/wdiag/install - install -m0755 -d $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/src/w{start,stop,estell} $(1)/usr/sbin/ endef diff --git a/net/weechat/Makefile b/net/weechat/Makefile index f0e8101fb..c98f50a86 100644 --- a/net/weechat/Makefile +++ b/net/weechat/Makefile @@ -56,9 +56,9 @@ define Build/Compile endef define Package/weechat/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/weechat-curses $(1)/usr/bin/ - install -d -m0755 $(1)/usr/lib/weechat/plugins + $(INSTALL_DIR) $(1)/usr/lib/weechat/plugins $(CP) $(PKG_INSTALL_DIR)/usr/lib/weechat/plugins/lua.so* $(1)/usr/lib/weechat/plugins/ endef diff --git a/net/wifidog/Makefile b/net/wifidog/Makefile index 7e27c3ed8..39d5ff131 100644 --- a/net/wifidog/Makefile +++ b/net/wifidog/Makefile @@ -48,16 +48,16 @@ define Build/Compile endef define Package/wifidog/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/scripts/init.d/wifidog $(1)/usr/bin/wifidog-init + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/init.d/wifidog $(1)/usr/bin/wifidog-init $(CP) $(PKG_INSTALL_DIR)/usr/bin/wifidog $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/wdctl $(1)/usr/bin/ - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libhttpd.so* $(1)/usr/lib/ - install -d -m0755 $(1)/etc - install -m0644 ./files/wifidog.conf $(1)/etc/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/$(PKG_NAME).init $(1)/etc/init.d/wifidog + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/wifidog.conf $(1)/etc/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/wifidog endef $(eval $(call BuildPackage,wifidog)) diff --git a/net/wknock/Makefile b/net/wknock/Makefile index 5614e4944..44f7b7cec 100644 --- a/net/wknock/Makefile +++ b/net/wknock/Makefile @@ -39,9 +39,9 @@ define Build/Compile endef define Package/wknock/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/wknock $(1)/usr/sbin/ - install -m0755 $(PKG_BUILD_DIR)/wknock-ng $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wknock $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wknock-ng $(1)/usr/sbin/ endef $(eval $(call BuildPackage,wknock)) diff --git a/net/wput/Makefile b/net/wput/Makefile index 30721cb3c..f49a69835 100644 --- a/net/wput/Makefile +++ b/net/wput/Makefile @@ -39,8 +39,8 @@ define Build/Compile endef define Package/wput/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/wput $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wput $(1)/usr/bin/ endef $(eval $(call BuildPackage,wput)) diff --git a/net/wrt-radauth/Makefile b/net/wrt-radauth/Makefile index fa45a11bc..1cfe08418 100644 --- a/net/wrt-radauth/Makefile +++ b/net/wrt-radauth/Makefile @@ -41,9 +41,9 @@ define Build/Compile endef define Package/wrt-radauth/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/radius-client $(1)/usr/sbin/ - install -m0755 $(PKG_BUILD_DIR)/wrt-radauth $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/radius-client $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wrt-radauth $(1)/usr/sbin/ endef $(eval $(call BuildPackage,wrt-radauth)) diff --git a/net/xinetd/Makefile b/net/xinetd/Makefile index 529ec7e21..d63756568 100644 --- a/net/xinetd/Makefile +++ b/net/xinetd/Makefile @@ -47,13 +47,13 @@ define Build/Compile endef define Package/xinetd/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/xinetd $(1)/usr/sbin/ - install -d -m0755 $(1)/etc - install -m0644 ./files/xinetd.conf $(1)/etc/xinetd.conf - install -d -m0755 $(1)/etc/xinetd.d - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/xinetd.init $(1)/etc/init.d/xinetd + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/xinetd.conf $(1)/etc/xinetd.conf + $(INSTALL_DIR) $(1)/etc/xinetd.d + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/xinetd.init $(1)/etc/init.d/xinetd endef $(eval $(call BuildPackage,xinetd)) diff --git a/net/xsupplicant/Makefile b/net/xsupplicant/Makefile index 0aa28bcb4..dcbc34414 100644 --- a/net/xsupplicant/Makefile +++ b/net/xsupplicant/Makefile @@ -61,11 +61,11 @@ define Build/Compile endef define Package/xsupplicant/install - install -d -m0755 $(1)/etc - install -m0644 $(PKG_BUILD_DIR)/etc/xsupplicant.conf $(1)/etc/ - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/xsupplicant.conf $(1)/etc/ + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/xsup_* $(1)/usr/bin/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/xsupplicant $(1)/usr/sbin/ endef diff --git a/net/yafc/Makefile b/net/yafc/Makefile index 5a151bb29..e0ca2b414 100644 --- a/net/yafc/Makefile +++ b/net/yafc/Makefile @@ -36,7 +36,7 @@ define Build/Compile endef define Package/yafc/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/src/yafc $(1)/usr/sbin/ endef diff --git a/sound/madplay/Makefile b/sound/madplay/Makefile index 379e22c18..7886c5dd9 100644 --- a/sound/madplay/Makefile +++ b/sound/madplay/Makefile @@ -59,7 +59,7 @@ define Build/Compile endef define Package/madplay/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/madplay $(1)/usr/bin/ endef diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile index 5fb9efdf6..6dee11874 100644 --- a/sound/mpd/Makefile +++ b/sound/mpd/Makefile @@ -66,9 +66,9 @@ define Build/Compile endef define Package/mpd/install - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_BUILD_DIR)/doc/mpdconf.example $(1)/etc/mpd.conf - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/mpd $(1)/usr/bin/ endef diff --git a/sound/mt-daapd/Makefile b/sound/mt-daapd/Makefile index 0fdbfffdf..798ef5989 100644 --- a/sound/mt-daapd/Makefile +++ b/sound/mt-daapd/Makefile @@ -57,15 +57,15 @@ define Build/Compile endef define Package/mt-daapd/install - install -d -m0755 $(1)/etc - install -m0644 $(PKG_BUILD_DIR)/contrib/mt-daapd.conf $(1)/etc/ - install -m0644 $(PKG_BUILD_DIR)/contrib/mt-daapd.playlist $(1)/etc/ - install -d -m0755 $(1)/usr/share + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/contrib/mt-daapd.conf $(1)/etc/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/contrib/mt-daapd.playlist $(1)/etc/ + $(INSTALL_DIR) $(1)/usr/share $(CP) $(PKG_INSTALL_DIR)/usr/share/mt-daapd $(1)/usr/share/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mt-daapd $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/mt-daapd.init $(1)/etc/init.d/mt-daapd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/mt-daapd.init $(1)/etc/init.d/mt-daapd endef $(eval $(call BuildPackage,mt-daapd)) diff --git a/sound/sox/Makefile b/sound/sox/Makefile index 2ffc94629..14cc50ea8 100644 --- a/sound/sox/Makefile +++ b/sound/sox/Makefile @@ -52,7 +52,7 @@ define Build/Compile endef define Package/sox/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/src/{play,sox,soxmix} $(1)/usr/bin/ endef diff --git a/utils/alsa-utils/Makefile b/utils/alsa-utils/Makefile index 65736d0e5..feef75bca 100644 --- a/utils/alsa-utils/Makefile +++ b/utils/alsa-utils/Makefile @@ -43,7 +43,7 @@ define Build/Compile endef define Package/alsa-utils/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/amixer $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/alsamixer $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/aplay $(1)/usr/bin/ diff --git a/utils/bc/Makefile b/utils/bc/Makefile index 9cd1edf21..9100ccef0 100644 --- a/utils/bc/Makefile +++ b/utils/bc/Makefile @@ -45,13 +45,13 @@ define Package/dc endef define Package/bc/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/bc/bc $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bc/bc $(1)/usr/bin/ endef define Package/dc/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/dc/dc $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/dc/dc $(1)/usr/bin/ endef $(eval $(call BuildPackage,bc)) diff --git a/utils/bluez-utils/Makefile b/utils/bluez-utils/Makefile index 13245fa0d..745f29cc0 100644 --- a/utils/bluez-utils/Makefile +++ b/utils/bluez-utils/Makefile @@ -63,11 +63,11 @@ define Build/Compile endef define Package/bluez-utils/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/bluetooth + $(INSTALL_DIR) $(1)/etc/bluetooth $(CP) $(PKG_INSTALL_DIR)/../hcid/hcid.conf $(1)/etc/bluetooth/ $(CP) $(PKG_INSTALL_DIR)/../rfcomm/rfcomm.conf $(1)/etc/bluetooth/ install -m0700 ./files/givepin $(1)/etc/bluetooth/ diff --git a/utils/cifsmount/Makefile b/utils/cifsmount/Makefile index 713c1451e..d2f79a415 100644 --- a/utils/cifsmount/Makefile +++ b/utils/cifsmount/Makefile @@ -33,8 +33,8 @@ define Build/Compile endef define Package/cifsmount/install - install -d -m0755 $(1)/sbin - install -m0755 $(PKG_BUILD_DIR)/mount.cifs $(1)/sbin/ + $(INSTALL_DIR) $(1)/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/mount.cifs $(1)/sbin/ endef $(eval $(call BuildPackage,cifsmount)) diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index 5a91077fe..507b2f1e9 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -57,12 +57,12 @@ define Build/Compile endef define Package/collectd/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/collectd $(1)/usr/sbin/ - install -d -m0755 $(1)/usr/lib/collectd + $(INSTALL_DIR) $(1)/usr/lib/collectd $(CP) $(PKG_INSTALL_DIR)/usr/lib/collectd/*.so $(1)/usr/lib/collectd/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/collectd.init $(1)/etc/init.d/collectd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/collectd.init $(1)/etc/init.d/collectd endef $(eval $(call BuildPackage,collectd)) diff --git a/utils/deco/Makefile b/utils/deco/Makefile index b5401a637..8833846fa 100644 --- a/utils/deco/Makefile +++ b/utils/deco/Makefile @@ -37,11 +37,11 @@ define Build/Compile endef define Package/deco/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/deco $(1)/usr/bin/ - install -d -m0755 $(1)/usr/lib/deco - install -m0644 $(PKG_BUILD_DIR)/menu $(1)/usr/lib/deco/menu - install -m0644 $(PKG_BUILD_DIR)/profile $(1)/usr/lib/deco/profile + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/deco $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/lib/deco + $(INSTALL_DATA) $(PKG_BUILD_DIR)/menu $(1)/usr/lib/deco/menu + $(INSTALL_DATA) $(PKG_BUILD_DIR)/profile $(1)/usr/lib/deco/profile endef $(eval $(call BuildPackage,deco)) diff --git a/utils/dosfstools/Makefile b/utils/dosfstools/Makefile index 0f2adaf50..ff62f026a 100644 --- a/utils/dosfstools/Makefile +++ b/utils/dosfstools/Makefile @@ -50,7 +50,7 @@ define Build/Compile endef define Package/dosfstools/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dosfsck $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/fsck.{msdos,vfat} $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mkdosfs $(1)/usr/sbin/ diff --git a/utils/dtach/Makefile b/utils/dtach/Makefile index 8422a24f1..2d93ee73b 100644 --- a/utils/dtach/Makefile +++ b/utils/dtach/Makefile @@ -37,8 +37,8 @@ define Build/Compile endef define Package/dtach/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/dtach $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/dtach $(1)/usr/bin/ endef $(eval $(call BuildPackage,dtach)) diff --git a/utils/e2fsprogs/Makefile b/utils/e2fsprogs/Makefile index d482fdf12..462a36e1c 100644 --- a/utils/e2fsprogs/Makefile +++ b/utils/e2fsprogs/Makefile @@ -57,13 +57,13 @@ define Build/Compile endef define Package/e2fsprogs/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/e2fsck $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mke2fs $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mkfs.ext{2,3} $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tune2fs $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/resize2fs $(1)/usr/sbin/ - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{blkid,com_err,e2p,ext2fs,uuid}.so.* $(1)/usr/lib/ endef diff --git a/utils/fetchmail/Makefile b/utils/fetchmail/Makefile index e740090e7..01b1cfaaa 100644 --- a/utils/fetchmail/Makefile +++ b/utils/fetchmail/Makefile @@ -48,7 +48,7 @@ define Build/Compile endef define Package/fetchmail/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/fetchmail $(1)/usr/bin/ endef diff --git a/utils/gnupg/Makefile b/utils/gnupg/Makefile index 35721b051..dd81afb94 100644 --- a/utils/gnupg/Makefile +++ b/utils/gnupg/Makefile @@ -55,8 +55,8 @@ define Build/Compile endef define Package/gnupg/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/g10/gpg $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/g10/gpg $(1)/usr/bin/ endef $(eval $(call BuildPackage,gnupg)) diff --git a/utils/hdparm/Makefile b/utils/hdparm/Makefile index f6402b403..c74ec81e3 100644 --- a/utils/hdparm/Makefile +++ b/utils/hdparm/Makefile @@ -43,8 +43,8 @@ define Build/Compile endef define Package/hdparm/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/hdparm $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/hdparm $(1)/usr/sbin endef $(eval $(call BuildPackage,hdparm)) diff --git a/utils/heyu/Makefile b/utils/heyu/Makefile index 8003d5239..3b150261f 100644 --- a/utils/heyu/Makefile +++ b/utils/heyu/Makefile @@ -40,10 +40,10 @@ define Build/Compile endef define Package/heyu/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/heyu $(1)/usr/bin/ - install -d -m0755 $(1)/etc/$(PKG_NAME) - install -m0644 ./files/x10.conf $(1)/etc/$(PKG_NAME)/x10.conf + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/heyu $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) + $(INSTALL_DATA) ./files/x10.conf $(1)/etc/$(PKG_NAME)/x10.conf endef $(eval $(call BuildPackage,heyu)) diff --git a/utils/lcd4linux/Makefile b/utils/lcd4linux/Makefile index 81bb3c15e..264c3856a 100644 --- a/utils/lcd4linux/Makefile +++ b/utils/lcd4linux/Makefile @@ -49,8 +49,8 @@ define Build/Compile endef define Package/lcd4linux/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/lcd4linux $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lcd4linux $(1)/usr/bin/ endef $(eval $(call BuildPackage,lcd4linux)) diff --git a/utils/lilo/Makefile b/utils/lilo/Makefile index ec8c5f20f..1f31d59ee 100644 --- a/utils/lilo/Makefile +++ b/utils/lilo/Makefile @@ -38,9 +38,9 @@ define Build/Compile endef define Package/lilo/install - install -d -m0755 $(1)/sbin + $(INSTALL_DIR) $(1)/sbin $(CP) $(PKG_BUILD_DIR)/lilo.static $(1)/sbin/lilo - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc $(CP) ./files/lilo.conf $(1)/etc/ $(CP) ./files/boot.msg $(1)/etc/ endef diff --git a/utils/logrotate/Makefile b/utils/logrotate/Makefile index 091e18302..4d0f3cfcf 100644 --- a/utils/logrotate/Makefile +++ b/utils/logrotate/Makefile @@ -52,11 +52,11 @@ define Build/Compile endef define Package/logrotate/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) ${PKG_BUILD_DIR}/logrotate $(1)/usr/sbin/ - install -d -m0755 $(1)/etc + $(INSTALL_DIR) $(1)/etc $(CP) ./files/logrotate.conf $(1)/etc/ - install -d -m0755 $(1)/etc/logrotate.d + $(INSTALL_DIR) $(1)/etc/logrotate.d endef $(eval $(call BuildPackage,logrotate)) diff --git a/utils/lrzsz/Makefile b/utils/lrzsz/Makefile index 8fff61888..28f8a49c8 100644 --- a/utils/lrzsz/Makefile +++ b/utils/lrzsz/Makefile @@ -43,7 +43,7 @@ define Build/Compile endef define Package/lrzsz/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/lrz $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/lsz $(1)/usr/bin/ (cd $(1)/usr/bin; \ diff --git a/utils/macchanger/Makefile b/utils/macchanger/Makefile index 792903431..467bdee50 100644 --- a/utils/macchanger/Makefile +++ b/utils/macchanger/Makefile @@ -39,9 +39,9 @@ define Build/Compile endef define Package/macchanger/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/macchanger $(1)/usr/bin/ - install -d -m0755 $(1)/usr/share + $(INSTALL_DIR) $(1)/usr/share $(CP) $(PKG_INSTALL_DIR)/usr/share/macchanger $(1)/usr/share/ endef diff --git a/utils/mgetty/Makefile b/utils/mgetty/Makefile index 100a1260d..221a6c5eb 100644 --- a/utils/mgetty/Makefile +++ b/utils/mgetty/Makefile @@ -92,8 +92,8 @@ define Build/Compile endef define Package/mgetty/install - install -d -m0755 $(1)/usr/bin - install -m0755 \ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ $(PKG_INSTALL_DIR)/usr/bin/faxq \ $(PKG_INSTALL_DIR)/usr/bin/faxrm \ $(PKG_INSTALL_DIR)/usr/bin/faxrunq \ @@ -103,13 +103,13 @@ define Package/mgetty/install $(PKG_INSTALL_DIR)/usr/bin/pbm2g3 \ $(PKG_INSTALL_DIR)/usr/bin/sff2g3 \ $(1)/usr/bin/ - install -d -m0755 $(1)/usr/sbin - install -m0755 \ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) \ $(PKG_INSTALL_DIR)/usr/sbin/mgetty \ $(PKG_INSTALL_DIR)/usr/sbin/sendfax \ $(PKG_INSTALL_DIR)/usr/sbin/faxrunqd \ $(1)/usr/sbin/ - install -d -m0755 $(1)/usr/lib/mgetty+sendfax + $(INSTALL_DIR) $(1)/usr/lib/mgetty+sendfax install -m4755 \ $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax/faxq-helper \ $(1)/usr/lib/mgetty+sendfax/ @@ -117,7 +117,7 @@ define Package/mgetty/install $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax/cour25n.pbm \ $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax/cour25.pbm \ $(1)/usr/lib/mgetty+sendfax/ - install -d -m0755 $(1)/etc/mgetty+sendfax + $(INSTALL_DIR) $(1)/etc/mgetty+sendfax install -m600 \ $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/dialin.config \ $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/faxheader \ diff --git a/utils/microcom/Makefile b/utils/microcom/Makefile index 3a304412c..33f4007f6 100644 --- a/utils/microcom/Makefile +++ b/utils/microcom/Makefile @@ -39,8 +39,8 @@ define Build/Compile endef define Package/microcom/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/microcom $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/microcom $(1)/usr/bin/ endef $(eval $(call BuildPackage,microcom)) diff --git a/utils/minicom/Makefile b/utils/minicom/Makefile index 6227828d1..db748e704 100644 --- a/utils/minicom/Makefile +++ b/utils/minicom/Makefile @@ -36,8 +36,8 @@ define Build/Compile endef define Package/minicom/install - install -m0755 -d $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/src/minicom $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/minicom $(1)/usr/sbin/ endef $(eval $(call BuildPackage,minicom)) diff --git a/utils/mutt/Makefile b/utils/mutt/Makefile index 19f6c6626..1a83d6e6f 100644 --- a/utils/mutt/Makefile +++ b/utils/mutt/Makefile @@ -44,7 +44,7 @@ define Build/Compile endef define Package/mutt/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/mutt $(1)/usr/bin/ endef diff --git a/utils/nano/Makefile b/utils/nano/Makefile index 9c18600c0..2fbc96359 100644 --- a/utils/nano/Makefile +++ b/utils/nano/Makefile @@ -52,7 +52,7 @@ define Build/Compile endef define Package/nano/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/nano $(1)/usr/bin/ endef diff --git a/utils/pciutils/Makefile b/utils/pciutils/Makefile index 11a063fe1..a5dd488a1 100644 --- a/utils/pciutils/Makefile +++ b/utils/pciutils/Makefile @@ -44,9 +44,9 @@ define Build/Compile endef define Package/pciutils/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/{lspci,setpci} $(1)/usr/sbin/ - install -d -m0755 $(1)/usr/share + $(INSTALL_DIR) $(1)/usr/share $(CP) $(PKG_BUILD_DIR)/pci.ids $(1)/usr/share/ endef diff --git a/utils/picocom/Makefile b/utils/picocom/Makefile index d79e7ea82..5730d5218 100644 --- a/utils/picocom/Makefile +++ b/utils/picocom/Makefile @@ -48,8 +48,8 @@ define Build/Compile endef define Package/picocom/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/picocom $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/picocom $(1)/usr/bin/ endef $(eval $(call BuildPackage,picocom)) diff --git a/utils/pipacs/Makefile b/utils/pipacs/Makefile index 0d84aa6f0..a79e67053 100644 --- a/utils/pipacs/Makefile +++ b/utils/pipacs/Makefile @@ -34,8 +34,8 @@ define Build/Compile endef define Package/pipacs/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/pipacs $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/pipacs $(1)/usr/bin/ endef $(eval $(call BuildPackage,pipacs)) diff --git a/utils/procmail/Makefile b/utils/procmail/Makefile index 10ba10011..3e1a32248 100644 --- a/utils/procmail/Makefile +++ b/utils/procmail/Makefile @@ -38,7 +38,7 @@ define Build/Compile endef define Package/procmail/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/src/procmail $(1)/usr/bin/ $(CP) $(PKG_BUILD_DIR)/src/formail $(1)/usr/bin/ endef diff --git a/utils/rrdcollect/Makefile b/utils/rrdcollect/Makefile index 420edf9ee..a2a90f1fd 100644 --- a/utils/rrdcollect/Makefile +++ b/utils/rrdcollect/Makefile @@ -81,19 +81,19 @@ define Build/Compile endef define Package/rrdcollect/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rrdcollect $(1)/usr/sbin/ endef define Package/rrdcollect-example/install - install -d -m0755 $(1)/etc - install -m0644 ./files/rrd.conf $(1)/etc/ - install -m0644 ./files/rrdcollect.conf $(1)/etc/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/rrdcollect.init $(1)/etc/init.d/rrdcollect - install -d -m0755 $(1)/usr/bin - install -m0755 ./files/rrd.sh $(1)/usr/bin/ - install -d -m0755 $(1)/www/cgi-bin + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/rrd.conf $(1)/etc/ + $(INSTALL_DATA) ./files/rrdcollect.conf $(1)/etc/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/rrdcollect.init $(1)/etc/init.d/rrdcollect + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) ./files/rrd.sh $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/www/cgi-bin ln -sf /var/lib/rrdcollect/rrd.cgi $(1)/www/cgi-bin/rrd.cgi ln -sf /var/lib/rrdcollect/img $(1)/www/img endef diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile index 5960a7dd0..32945b69f 100644 --- a/utils/rrdtool/Makefile +++ b/utils/rrdtool/Makefile @@ -80,20 +80,20 @@ define Build/Compile endef define Package/rrdtool/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(1)/usr/bin/ endef define Package/rrdcgi/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/ endef define Package/librrd/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(1)/usr/lib/ - install -d -m0755 $(1)/usr/share/rrdtool/fonts + $(INSTALL_DIR) $(1)/usr/share/rrdtool/fonts $(CP) $(PKG_BUILD_DIR)/src/DejaVuSansMono-Roman.ttf \ $(1)/usr/share/rrdtool/fonts/ endef diff --git a/utils/rsync/Makefile b/utils/rsync/Makefile index 6b4f72966..8e242ad41 100644 --- a/utils/rsync/Makefile +++ b/utils/rsync/Makefile @@ -46,7 +46,7 @@ define Build/Compile endef define Package/rsync/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/rsync $(1)/usr/bin/ endef diff --git a/utils/sane-backends/Makefile b/utils/sane-backends/Makefile index abccacb9f..ade655d08 100644 --- a/utils/sane-backends/Makefile +++ b/utils/sane-backends/Makefile @@ -64,16 +64,16 @@ define Package/sane-backends/conffiles endef define Package/sane-backends/install - install -d -m0755 $(1)/etc/sane.d + $(INSTALL_DIR) $(1)/etc/sane.d $(CP) $(PKG_INSTALL_DIR)/etc/sane.d/*.conf $(1)/etc/sane.d/ - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/saned $(1)/usr/sbin/ endef define Package/sane-libs/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsane.so.* $(1)/usr/lib/ - install -d -m0755 $(1)/usr/lib/sane + $(INSTALL_DIR) $(1)/usr/lib/sane $(CP) $(PKG_INSTALL_DIR)/usr/lib/sane/libsane-*.so.* $(1)/usr/lib/sane/ endef diff --git a/utils/screen/Makefile b/utils/screen/Makefile index d51e3e5b6..8fd73bb68 100644 --- a/utils/screen/Makefile +++ b/utils/screen/Makefile @@ -40,8 +40,8 @@ define Build/Compile endef define Package/screen/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/screen $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/screen $(1)/usr/sbin/ endef $(eval $(call BuildPackage,screen)) diff --git a/utils/setpwc/Makefile b/utils/setpwc/Makefile index 354096639..4ccf2bf49 100644 --- a/utils/setpwc/Makefile +++ b/utils/setpwc/Makefile @@ -35,8 +35,8 @@ define Build/Compile endef define Package/setpwc/install - install -d -m0755 $(1)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/setpwc $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/setpwc $(1)/usr/bin/ endef $(eval $(call BuildPackage,setpwc)) diff --git a/utils/setserial/Makefile b/utils/setserial/Makefile index 2d3d18bb4..8b7a87e81 100644 --- a/utils/setserial/Makefile +++ b/utils/setserial/Makefile @@ -42,10 +42,10 @@ define Build/Compile endef define Package/setserial/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/setserial $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/serial.init $(1)/etc/init.d/setserial + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/setserial $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/serial.init $(1)/etc/init.d/setserial endef $(eval $(call BuildPackage,setserial)) diff --git a/utils/strace/Makefile b/utils/strace/Makefile index b3a9d90e7..af5a7082b 100644 --- a/utils/strace/Makefile +++ b/utils/strace/Makefile @@ -40,8 +40,8 @@ define Build/Compile endef define Package/strace/install - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/strace $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/strace $(1)/usr/sbin/ endef $(eval $(call BuildPackage,strace)) diff --git a/utils/usbutils/Makefile b/utils/usbutils/Makefile index 81c60532d..672eb6354 100644 --- a/utils/usbutils/Makefile +++ b/utils/usbutils/Makefile @@ -39,9 +39,9 @@ define Build/Compile endef define Package/usbutils/install - install -d -m0755 $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/lsusb $(1)/usr/sbin/ - install -d -m0755 $(1)/usr/share + $(INSTALL_DIR) $(1)/usr/share $(CP) $(PKG_INSTALL_DIR)/usr/share/usb.ids $(1)/usr/share/ endef diff --git a/utils/vim/Makefile b/utils/vim/Makefile index aee09ffc0..0016d27bf 100644 --- a/utils/vim/Makefile +++ b/utils/vim/Makefile @@ -42,9 +42,9 @@ define Build/Configure endef define Package/vim/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/bin/ - install -d -m0755 $(1)/usr/share/vim + $(INSTALL_DIR) $(1)/usr/share/vim $(CP) ./files/vimrc $(1)/usr/share/vim/ endef diff --git a/utils/wx200d/Makefile b/utils/wx200d/Makefile index 967219bfd..6dde919b2 100644 --- a/utils/wx200d/Makefile +++ b/utils/wx200d/Makefile @@ -43,13 +43,13 @@ define Build/Compile endef define Package/wx200d/install - install -d -m0755 $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/wx200 \ $(PKG_INSTALL_DIR)/usr/bin/wxstdout \ $(PKG_INSTALL_DIR)/usr/bin/wxfilter \ $(PKG_INSTALL_DIR)/usr/bin/wxdebug \ $(1)/usr/bin/ - install -d -m0755 $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/wx200d \ $(PKG_INSTALL_DIR)/usr/sbin/wxread \ $(1)/usr/sbin/ -- 2.30.2