* 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

@@ -46,6 +46,9 @@ rule AddFileDataResource
 	# <resourceID>: A resource ID string as understood by xres (type:id[:name]).
 	# <dataFile>: 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
-		= <added-resources>file-data-$(resourceID).rsrc ;
+		= <added-resources>file-data-$(resourceID)-$(dataFile).rsrc ;
 
 	# add it to the resources of the given target
 	AddResources $(target) : $(resources) ;

src/kits/network/Jamfile

@@ -2,8 +2,9 @@ SubDir HAIKU_TOP src kits network ;
 
 UsePrivateHeaders libroot net ;
 
-AddFileDataResource libnetwork.so : CSTR:201:services :
+local services = [ FGristFiles services ] ;
-	[ FDirName $(SUBDIR) dns defaults services ] ;
+SEARCH on $(services) = [ FDirName $(SUBDIR) dns defaults ] ;
+AddFileDataResource libnetwork.so : CSTR:201:services : $(services) ;
 
 SharedLibrary libnetwork.so :
 	init.cpp