summaryrefslogtreecommitdiffstats
path: root/package/Makefile.autotools.in
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2007-09-12 04:37:31 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2007-09-12 04:37:31 +0000
commit5f17c052bcae08bfd08ddca736a68b02bf3672e7 (patch)
treee1b822c30143fc5aa457a92f4d97aaa6ed02b878 /package/Makefile.autotools.in
parent7521f37372839210e18207223ef54ed768422726 (diff)
downloadbuildroot-novena-5f17c052bcae08bfd08ddca736a68b02bf3672e7.tar.gz
buildroot-novena-5f17c052bcae08bfd08ddca736a68b02bf3672e7.zip
Update various packages to make X run
Diffstat (limited to 'package/Makefile.autotools.in')
-rw-r--r--package/Makefile.autotools.in15
1 files changed, 13 insertions, 2 deletions
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 17fd9621e..5a89727f6 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -147,7 +147,8 @@ $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $($(PKG)_NAME)-$($(PKG)_VERSION)
$(BUILD_DIR)/%/.stamp_patched:
$(call MESSAGE,"Patching")
$(if $($(PKG)_PATCH),toolchain/patch-kernel.sh $(@D) $(DL_DIR) $($(PKG)_PATCH))
- $(Q)(if test -d package/$($(PKG)_NAME) ; then \
+ $(Q)(\
+ if test -d package/$($(PKG)_NAME) ; then \
if test "$(wildcard package/$($(PKG)_NAME)/$(NAMEVER)*.patch)" ; then \
toolchain/patch-kernel.sh $(@D) package/$($(PKG)_NAME) $(NAMEVER)\*.patch || exit 1 ; \
else \
@@ -156,7 +157,17 @@ $(BUILD_DIR)/%/.stamp_patched:
toolchain/patch-kernel.sh $(@D) package/$($(PKG)_NAME)/$(NAMEVER) \*.patch || exit 1 ; \
fi; \
fi; \
- fi)
+ else \
+ if test "$(wildcard package/x11r7/$($(PKG)_NAME)/$(NAMEVER)*.patch)" ; then \
+ toolchain/patch-kernel.sh $(@D) package/x11r7/$($(PKG)_NAME) $(NAMEVER)\*.patch || exit 1 ; \
+ else \
+ toolchain/patch-kernel.sh $(@D) package/x11r7/$($(PKG)_NAME) $($(PKG)_NAME)\*.patch || exit 1 ; \
+ if test -d package/x11r7/$($(PKG)_NAME)/$(NAMEVER) ; then \
+ toolchain/patch-kernel.sh $(@D) package/x11r7/$($(PKG)_NAME)/$(NAMEVER) \*.patch || exit 1 ; \
+ fi; \
+ fi; \
+ fi; \
+ )
ifeq ($(strip $(BR2_UPDATE_CONFIG)),y)
$(Q)(for file in config.guess config.sub; do \
for i in $$(find $(@D) -name $$file); do \