diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-04-11 18:51:21 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-04-12 15:30:40 +0200 |
| commit | c3b568cbeb35fe9209ed40ca614fde3eeb6b6c26 (patch) | |
| tree | af4e32b9a8b1e13c91c7f53c13fb5ddad7089bf8 /rules/inetutils.make | |
| parent | 9853bd8b1ccff0c6707fbd3f6ce0d91c459f12f7 (diff) | |
| download | ptxdist-c3b568cbeb35fe9209ed40ca614fde3eeb6b6c26.tar.gz ptxdist-c3b568cbeb35fe9209ed40ca614fde3eeb6b6c26.tar.xz | |
[inetutils] create real install stage
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/inetutils.make')
| -rw-r--r-- | rules/inetutils.make | 72 |
1 files changed, 9 insertions, 63 deletions
diff --git a/rules/inetutils.make b/rules/inetutils.make index b1fdbc1b5..e00002b47 100644 --- a/rules/inetutils.make +++ b/rules/inetutils.make @@ -47,6 +47,7 @@ INETUTILS_AUTOCONF := $(CROSS_AUTOCONF_USR) \ --with-PATH-CP=/bin/cp \ --localstatedir=/var \ --sysconfdir=/etc \ + --libexecdir=/usr/sbin \ --disable-ftpd \ --disable-rexecd \ --disable-talkd \ @@ -120,56 +121,6 @@ INETUTILS_AUTOCONF += --disable-tftpd endif # ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/inetutils.compile: - @$(call targetinfo) - $(INETUTILS_PATH) $(MAKE) -C $(INETUTILS_DIR)/lib - $(INETUTILS_PATH) $(MAKE) -C $(INETUTILS_DIR)/libinetutils - -# First the libraries: -ifdef PTXCONF_INETUTILS_PING - cd $(INETUTILS_DIR)/libicmp && $(INETUTILS_PATH) $(MAKE) -endif - -# Now the tools: -ifdef PTXCONF_INETUTILS_INETD - cd $(INETUTILS_DIR)/inetd && $(INETUTILS_PATH) $(MAKE) -endif -ifdef PTXCONF_INETUTILS_PING - cd $(INETUTILS_DIR)/ping && $(INETUTILS_PATH) $(MAKE) -endif -ifdef PTXCONF_INETUTILS_RCP - cd $(INETUTILS_DIR)/rcp && $(INETUTILS_PATH) $(MAKE) -endif -ifdef PTXCONF_INETUTILS_RLOGIND - cd $(INETUTILS_DIR)/rlogind && $(INETUTILS_PATH) $(MAKE) -endif -ifdef PTXCONF_INETUTILS_RSH - cd $(INETUTILS_DIR)/rsh && $(INETUTILS_PATH) $(MAKE) -endif -ifdef PTXCONF_INETUTILS_RSHD - cd $(INETUTILS_DIR)/rshd && $(INETUTILS_PATH) $(MAKE) -endif -ifdef PTXCONF_INETUTILS_SYSLOGD - cd $(INETUTILS_DIR)/syslogd && $(INETUTILS_PATH) $(MAKE) -endif - -ifdef PTXCONF_INETUTILS_TFTPD - cd $(INETUTILS_DIR)/tftpd && $(INETUTILS_PATH) $(MAKE) -endif - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/inetutils.install: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -186,34 +137,29 @@ $(STATEDIR)/inetutils.targetinstall: @$(call install_fixup, inetutils,DESCRIPTION,missing) ifdef PTXCONF_INETUTILS_INETD - @$(call install_copy, inetutils, 0, 0, 0755, \ - $(INETUTILS_DIR)/inetd/inetd, /usr/sbin/inetd) + @$(call install_copy, inetutils, 0, 0, 0755, -, /usr/sbin/inetd) endif ifdef PTXCONF_INETUTILS_PING @$(call install_copy, inetutils, 0, 0, 0755, \ - $(INETUTILS_DIR)/ping/ping, /bin/ping) + $(INETUTILS_PKGDIR)/usr/bin/ping, /bin/ping) endif ifdef PTXCONF_INETUTILS_RCP - @$(call install_copy, inetutils, 0, 0, 0755, \ - $(INETUTILS_DIR)/rcp/rcp, /usr/bin/rcp) + @$(call install_copy, inetutils, 0, 0, 0755, -, /usr/bin/rcp) endif ifdef PTXCONF_INETUTILS_RLOGIND - @$(call install_copy, inetutils, 0, 0, 0755, \ - $(INETUTILS_DIR)/rlogind/rlogind, /usr/sbin/rlogind) + @$(call install_copy, inetutils, 0, 0, 0755, -, /usr/sbin/rlogind) endif ifdef PTXCONF_INETUTILS_RSH - @$(call install_copy, inetutils, 0, 0, 0755, \ - $(INETUTILS_DIR)/rsh/rsh, /usr/bin/rsh) + @$(call install_copy, inetutils, 0, 0, 0755, -, /usr/bin/rsh) endif ifdef PTXCONF_INETUTILS_RSHD - @$(call install_copy, inetutils, 0, 0, 0755, \ - $(INETUTILS_DIR)/rshd/rshd, /usr/sbin/rshd) + @$(call install_copy, inetutils, 0, 0, 0755, -, /usr/sbin/rshd) @$(call install_alternative, inetutils, 0, 0, 0644, \ /etc/inetd.conf.d/inetutils-rshd, n) endif ifdef PTXCONF_INETUTILS_SYSLOGD @$(call install_copy, inetutils, 0, 0, 0755, \ - $(INETUTILS_DIR)/syslogd/syslogd, /sbin/syslogd) + $(INETUTILS_PKGDIR)/usr/sbin/syslogd, /sbin/syslogd) endif ifdef PTXCONF_INETUTILS_SYSLOGD_STARTSRCIPT @$(call install_alternative, inetutils, 0, 0, 0755, \ @@ -225,7 +171,7 @@ ifdef PTXCONF_INETUTILS_SYSLOGD_CONFIG endif ifdef PTXCONF_INETUTILS_TFTPD @$(call install_copy, inetutils, 0, 0, 0755, \ - $(INETUTILS_DIR)/tftpd/tftpd, /sbin/tftpd) + $(INETUTILS_PKGDIR)/usr/sbin/tftpd, /sbin/tftpd) ifneq ($(PTXCONF_INETUTILS_TFTPD_BASE_DIR),"") # # create the base dir @$(call install_copy, inetutils, 99, 0, 0755, \ |