Changeset 54f72bc in freewrt for package/rules.mk

Timestamp:

Jul 25, 2006, 1:36:46 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

ecb5fbe

Parents:

f3b127c

Message:

(cd package/foo; TOPDIR=../.. gmake update-patches) # should now work

IMPORTANT: gmake TOPDIR=../.. foo *does not work* (since it overrides
the correct value which otherwise gets pulled from prereq.mk after it
has been found from the environment-TOPDIR value and gets preference)

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

File:

• package/rules.mk (modified) (1 diff)

package/rules.mk

@@ -102 +102 @@
 
 update-patches:
-        @echo >&2 not ready;exit 1
+        @test ! -d ${WRKDIR}.orig || rm -rf ${WRKDIR}.orig
+        @test ! -d ${WRKDIR}.orig
+        @$(MAKE) -s V=0 prepare WRKDIR=${WRKDIR}.orig PATCH=:
         @toedit=$$(WRKDIST='${WRKSRC}' PATCHDIR=$$(pwd)/patches \
-            PATCH_LIST='${PATCH_LIST}' DIFF_ARGS= \
-            DISTORIG=.bak.orig PATCHORIG=.orig \
+            PATCH_LIST='patch-* *.patch' WRKDIR1='${WRKDIR}' \
             ${BASH} ${TOPDIR}/scripts/update-patches); \
-            if [[ -n $$toedit ]]; then \
-                read i?'edit patches: '; \
+            if [[ -n $$toedit && $$toedit != FAIL ]]; then \
+                echo -n 'edit patches: '; read i; \
                 cd patches && $${VISUAL:-$${EDITOR:-/usr/bin/vi}} $$toedit; \
-        fi
+            fi; \
+            rm -rf ${WRKDIR}.orig; \
+            [[ $$toedit != FAIL ]]
 
 .PHONY: all source prepare compile install clean update-patches