X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rt-layout.patch;h=a65a9e0129efc4043d7e15190af5fcb1583b5056;hb=e7392ed95ebc3a78b1a0836d525820eaf6c976f4;hp=57ac88a4924db3f62d5323435230d85bde9c35ea;hpb=a33f81b0d5d6384ecdce97b1a201cffd38d42bea;p=packages%2Frt.git

diff --git a/rt-layout.patch b/rt-layout.patch
index 57ac88a..a65a9e0 100644
--- a/rt-layout.patch
+++ b/rt-layout.patch
@@ -4,7 +4,7 @@
    customlibdir:		${customdir}/lib
  </Layout>
  
-+<Layout FHS>
++<Layout PLDFHS>
 +  prefix:		/usr/local
 +  exec_prefix:		${prefix}
 +  bindir:		${prefix}/bin
@@ -32,25 +32,3 @@
  <Layout FreeBSD>
    prefix:		/usr/local
    exec_prefix:		${prefix}
---- m4/rt_layout.m4.bak	2004-10-14 17:55:37.000000000 +0200
-+++ m4/rt_layout.m4	2004-10-14 18:18:41.000000000 +0200
-@@ -21,14 +21,15 @@
- 		pldconf=./config.pld
- 		$PERL  -0777 -p -e "\$layout = '$2';"  -e '
- 		s/.*<Layout\s+$layout>//gims; 
--		s/\<\/Layout\>.*//s; 
--		s/^#.*$//m;
-+		s/<\/Layout>.*//s; 
-+		s/^#.*$//gm;
- 		s/^\s+//gim;
- 		s/\s+$/\n/gim;
- 		s/\+$/\/rt3/gim;
- 		# m4 will not let us just use $1, we need @S|@1
--		s/^\s*((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
--		s/^\s*(.*?)\s*:\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim;
-+#		s/^((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
-+		# uh, should be [:=], but m4 apparently substitutes something...
-+		s/^(.*?)\s*(?::|=)\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim;
- 		 ' < $1 > $pldconf
- 
- 		if test -s $pldconf; then