Changeset c2e2d0c in freewrt for tools/sed/Makefile

Timestamp:

Jul 22, 2006, 4:08:05 AM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

c746a832

Parents:

07526d20

Message:

sanitise the way tools which must be in lbin/ (currently,
sed and pax/cpio/tar, but there will be more...) are handled:
make prereq invokes a special recursive target install-lbin
which copies them from the staging dir into lbin if they exist
there (i.e. are already installed), or removes the install stamp
otherwise. the tools' install-lbin target does however duplicate
a little code, this could be done better but it works OK like this

also, add a missing include to brcm-utils and fix pax' clean target

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@339 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• tools/sed/Makefile (modified) (2 diffs)

tools/sed/Makefile

@@ -6 +6 @@
 PKG_MD5SUM:=            928f0e06422f414091917401f1a834d0
 PKG_SOURCE_URL:=        ftp://ftp.gnu.org/gnu/sed
-PKG_BINARY:=            sed/sed
-PKG_TARGET_BINARY:=     bin/sed
 
 include $(TOPDIR)/rules.mk
@@ -27 +25 @@
         touch $@
 
-$(WRKBUILD)/$(PKG_BINARY): $(WRKBUILD)/.configured
+$(WRKBUILD)/sed/sed: $(WRKBUILD)/.configured
         $(MAKE) -C $(WRKBUILD)
 
-# This stuff is needed to work around GNU make deficiencies
-build-sed-host-binary: $(WRKBUILD)/$(PKG_BINARY)
-        @if [ -L $(STAGING_DIR)/$(PKG_TARGET_BINARY) ] ; then \
-                rm -f $(STAGING_DIR)/$(PKG_TARGET_BINARY); fi;
-        @if [ ! -f $(STAGING_DIR)/$(PKG_TARGET_BINARY) -o $(STAGING_DIR)/$(PKG_TARGET_BINARY) \
-        -ot $(WRKBUILD)/$(PKG_BINARY) ] ; then \
-            set -x; \
-            mkdir -p $(STAGING_DIR)/bin; \
-            $(MAKE) DESTDIR=$(STAGING_DIR) -C $(WRKBUILD) install; \
-            mv $(STAGING_DIR)/usr/bin/sed $(STAGING_DIR)/bin/; \
-            rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \
-                    $(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc; fi
+source: 
+prepare: $(WRKBUILD)/.unpacked
 
-install-lbin: ${WRKBUILD}/${PKG_BINARY}
-        install -c -s -m 555 ${WRKBUILD}/${PKG_BINARY} ${TOPDIR}/lbin/sed
+compile: $(WRKBUILD)/sed/sed
 
-source: 
-prepare: 
-compile: 
-install: build-sed-host-binary install-lbin
+install: compile
+        mkdir -p $(STAGING_DIR)/bin
+        rm -f $(STAGING_DIR)/bin/sed ${TOPDIR}/lbin/sed
+        install -c -s -m 555 ${WRKBUILD}/sed/sed $(STAGING_DIR)/bin/sed
+        cp $(STAGING_DIR)/bin/sed ${TOPDIR}/lbin/sed
+
+install-lbin:
+        rm -f ${TOPDIR}/lbin/sed
+        if [ -e $(STAGING_DIR)/bin/sed ]; then \
+                cp $(STAGING_DIR)/bin/sed ${TOPDIR}/lbin/sed; \
+        else \
+                rm -f $(TOOLS_STAMP_DIR)/.tools_sed-install; \
+        fi
+
 clean: 
         rm -rf $(WRKBUILD)
-        rm -f $(STAGING_DIR)/$(PKG_TARGET_BINARY)
+        rm -f $(STAGING_DIR)/bin/sed ${TOPDIR}/lbin/sed