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

diff --git a/rt-layout.patch b/rt-layout.patch
index 57ac88a..7ec53c4 100644
--- a/rt-layout.patch
+++ b/rt-layout.patch
@@ -1,21 +1,25 @@
 --- config.layout~	2004-03-28 06:04:08.000000000 +0200
 +++ config.layout	2004-10-14 17:37:13.000000000 +0200
-@@ -59,6 +59,31 @@
+@@ -59,6 +59,37 @@
    customlibdir:		${customdir}/lib
  </Layout>
  
-+<Layout FHS>
++<Layout PLDFHS>
 +  prefix:		/usr/local
 +  exec_prefix:		${prefix}
 +  bindir:		${prefix}/bin
 +  sbindir:		${prefix}/sbin
-+  sysconfdir:		/etc+
++  sysconfdir:		/etc/rt
 +  datadir:		${prefix}/share
 +# FIXME: missing support for lib64
 +  libdir:		${prefix}/lib
 +  mandir:		${datadir}/man
 +# FIXME: no such directory in FHS; shouldn't go to somewhere in "${datadir}/rt/"?
-+  htmldir:		${datadir}/html
++  plugindir:		${datadir}/plugins
++  htmldir:		${datadir}/rt/html
++  lexdir:		${datadir}/rt/po
++  staticdir:		${datadir}/rt/static
++  fontdir:		${datadir}/fonts/TTF
 +  manualdir:		${datadir}/doc
 +  localstatedir:	/var
 +  logfiledir:		${localstatedir}/log
@@ -23,34 +27,14 @@
 +  masonstatedir:	${localstatedir}/cache/mason_data
 +  sessionstatedir:	${localstatedir}/cache/session_data
 +  customdir:		${prefix}/local
-+  custometcdir:		${customdir}/etc
++  custometcdir:	${customdir}/etc
 +  customhtmldir:	${customdir}/html
-+  customlexdir:		${customdir}/po
-+  customlibdir:		${customdir}/lib
++  customlexdir:	${customdir}/po
++  customstaticdir:	${customdir}/static
++  customlibdir:	${customdir}/lib
++  customplugindir:	${customdir}/plugins
 +</Layout>
 +
  <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