From ef33454cfdd31d6868d3c6f7ed661bc52ace848c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 28 Dec 2006 21:28:17 +0000 Subject: [PATCH] * Reverted my change to AddFileDataResource - I obviously missed someone's intentions :-) * Added a comment about the proper use of the data-file argument. * Applied Ingo's suggestion to the Jamfile, and it worked out of the box. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19649 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/BeOSRules | 5 ++++- src/kits/network/Jamfile | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build/jam/BeOSRules b/build/jam/BeOSRules index 5bffc2a1da..0caba7c899 100644 --- a/build/jam/BeOSRules +++ b/build/jam/BeOSRules @@ -46,6 +46,9 @@ rule AddFileDataResource # : A resource ID string as understood by xres (type:id[:name]). # : The data to be written into the resource will be read from # that file. + # Note that this is supposed to be a build target, not a path + # name - if you need to add a data file in a different path, you + # have to locate it first. # local target = $(1) ; local resourceID = $(2) ; @@ -53,7 +56,7 @@ rule AddFileDataResource # the resource file local resources - = file-data-$(resourceID).rsrc ; + = file-data-$(resourceID)-$(dataFile).rsrc ; # add it to the resources of the given target AddResources $(target) : $(resources) ; diff --git a/src/kits/network/Jamfile b/src/kits/network/Jamfile index c82eb9ba94..1a203e08c8 100644 --- a/src/kits/network/Jamfile +++ b/src/kits/network/Jamfile @@ -2,8 +2,9 @@ SubDir HAIKU_TOP src kits network ; UsePrivateHeaders libroot net ; -AddFileDataResource libnetwork.so : CSTR:201:services : - [ FDirName $(SUBDIR) dns defaults services ] ; +local services = [ FGristFiles services ] ; +SEARCH on $(services) = [ FDirName $(SUBDIR) dns defaults ] ; +AddFileDataResource libnetwork.so : CSTR:201:services : $(services) ; SharedLibrary libnetwork.so : init.cpp